rpms/openoffice.org/devel openoffice.org-3.0.0.ooo87991.fpickersafe.patch, NONE, 1.1 openoffice.org.spec, 1.1467, 1.1468

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23396

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/devel/openoffice.org.spec,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -r1.1467 -r1.1468
--- openoffice.org.spec	7 Apr 2008 08:39:27 -0000	1.1467
+++ openoffice.org.spec	7 Apr 2008 09:04:36 -0000	1.1468
@@ -139,6 +139,7 @@
 Patch66: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
 Patch68: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch69: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1122,6 +1123,7 @@
 %patch66 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 %patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
 %patch68 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch69 -p1 -b .ooo87991.fpickersafe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2872,6 +2874,7 @@
 %changelog
 * Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
 - Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+- Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 
 * Fri Apr 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.2
 - reenable dicts