rpms/openoffice.org/F-10 openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch, NONE, 1.1 openoffice.org.spec, 1.1721, 1.1722

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26103/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch 
Log Message:
add openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch

openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch:

--- NEW FILE openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch ---
Index: source/ui/dbui/addresslistdialog.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/addresslistdialog.cxx,v
retrieving revision 1.21
diff -u -r1.21 addresslistdialog.cxx
--- sw.orig/source/ui/dbui/addresslistdialog.cxx	10 Apr 2008 18:18:43 -0000	1.21
+++ sw/source/ui/dbui/addresslistdialog.cxx	23 Feb 2009 15:15:36 -0000
@@ -144,7 +148,9 @@
                 }
                 if(!sCharSet.compareToAscii( cUTF8 ))
                 {
-                    sURL = String(sDBURL).Copy( 10 );
+					INetURLObject aURL;
+        			aURL.SetSmartURL( sDBURL.copy( 10 ) );
+					sURL = aURL.GetMainURL(INetURLObject::NO_DECODE);
                     sURL += C2U("/");
                     sURL += aFilters[0];
                     sURL += C2U(".");


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1721
retrieving revision 1.1722
diff -u -r1.1721 -r1.1722
--- openoffice.org.spec	23 Feb 2009 12:46:11 -0000	1.1721
+++ openoffice.org.spec	23 Feb 2009 15:23:13 -0000	1.1722
@@ -143,6 +143,7 @@
 Patch70: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 Patch71: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
 Patch72: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1406,10 +1407,11 @@
 %patch66 -p1 -b .ooo98649.svtools.missingUI.patch
 %patch67 -p1 -b .ooo98885.sw.safeindex.patch
 %patch68 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
-%patch69 -p1 -b .workspace.xmergeclean.patch
-%patch70 -p1 -b .ooo99427.sd.ensure-icons-state.patch
-%patch71 -p1 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch72 -p1 -b .ooo99529.sw.notrailingnewline.patch
+%patch69 -p0 -b .workspace.xmergeclean.patch
+%patch70 -p0 -b .ooo99427.sd.ensure-icons-state.patch
+%patch71 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
+%patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3785,6 +3787,7 @@
 - Resolves: rhbz#486362 add openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 - Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
 - Resolves: rhbz#486934 add openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+- add openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 
 * Tue Jan 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add