rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo87991.fpickersafe.patch, NONE, 1.1 openoffice.org.spec, 1.1462, 1.1463
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Apr 7 09:08:38 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo87991.fpickersafe.patch
Log Message:
Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
openoffice.org-3.0.0.ooo87991.fpickersafe.patch:
--- NEW FILE openoffice.org-3.0.0.ooo87991.fpickersafe.patch ---
Index: source/unx/gnome/SalGtkPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkPicker.cxx,v
retrieving revision 1.14
diff -u -r1.14 SalGtkPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx 24 Oct 2006 15:02:38 -0000 1.14
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx 7 Apr 2008 08:59:52 -0000
@@ -85,6 +85,9 @@
rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
{
+ if (!pIn)
+ return rtl::OUString();
+
rtl::OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn),
RTL_TEXTENCODING_UTF8 );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1462
retrieving revision 1.1463
diff -u -r1.1462 -r1.1463
--- openoffice.org.spec 7 Apr 2008 08:41:13 -0000 1.1462
+++ openoffice.org.spec 7 Apr 2008 09:07:32 -0000 1.1463
@@ -149,6 +149,7 @@
Patch76: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
Patch77: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
Patch78: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch79: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
%define instdir %{_libdir}/openoffice.org
@@ -1112,6 +1113,7 @@
%patch76 -p1 -b .ooo87204.toolkit.64bitevent.patch
%patch77 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
%patch78 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch79 -p1 -b .ooo87991.fpickersafe.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2899,6 +2901,7 @@
* Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
- Resolves: rhbz#439727 find another crasher
- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+- Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
* Wed Apr 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.5
- Resolves: rhbz#439727 find crasher
More information about the fedora-extras-commits
mailing list