rpms/openoffice.org/devel openoffice.org.spec, 1.292, 1.293 workspace-fpicker4.patch, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19685

Modified Files:
	openoffice.org.spec workspace-fpicker4.patch 
Log Message:
leading slash in fpicker


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- openoffice.org.spec	10 Jul 2005 18:20:34 -0000	1.292
+++ openoffice.org.spec	11 Jul 2005 08:19:04 -0000	1.293
@@ -1,5 +1,5 @@
 %define ooo2ver 116
-%define ooo_rpm_release 2
+%define ooo_rpm_release 2-cmc
 %define build_fc4 0
 %define build_fc5 1
 
@@ -2945,6 +2945,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-2-cmc
+- enable evo addressbook in addressbook wizard
+- rh#162875# extra leading / from file picker
+
 * Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-2
 - add openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
 

workspace-fpicker4.patch:
 fpicker/source/unx/gnome/SalGtkFilePicker.cxx |  339 +++++++++++++++-----------
 fpicker/source/unx/gnome/SalGtkFilePicker.hxx |   22 -
 fpicker/source/unx/gnome/SalGtkPicker.cxx     |   19 +
 fpicker/source/unx/gnome/SalGtkPicker.hxx     |    5 
 fpicker/source/unx/gnome/makefile.mk          |    2 
 source/unx/gnome/SalGtkPicker.cxx             |    0 
 6 files changed, 230 insertions(+), 157 deletions(-)

Index: workspace-fpicker4.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace-fpicker4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace-fpicker4.patch	10 Jun 2005 09:02:17 -0000	1.3
+++ workspace-fpicker4.patch	11 Jul 2005 08:19:04 -0000	1.4
@@ -729,3 +729,19 @@
  		$(SLO)$/FPentry.obj
  
  SHL1NOCHECK=TRUE
+Index: source/unx/gnome/SalGtkPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkPicker.cxx,v
+retrieving revision 1.6
+diff -u -p -r1.6 SalGtkPicker.cxx
+--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx	3 May 2005 13:48:23 -0000	1.6
++++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx	11 Jul 2005 08:00:59 -0000
+@@ -113,7 +113,7 @@ rtl::OUString SalGtkPicker::uritounicode
+     {
+         gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL);
+         rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), osl_getThreadTextEncoding());
+-	INetURLObject aCurrentURL(OUString::createFromAscii("file:///") + sEncoded);
++	INetURLObject aCurrentURL(OUString::createFromAscii("file://") + sEncoded);
+ 	aCurrentURL.SetHost(aURL.GetHost());
+ 	sURL = aCurrentURL.getExternalURL();
+     }