rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch, NONE, 1.1 openoffice.org.spec, 1.1822, 1.1823

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -r1.1822 -r1.1823
--- openoffice.org.spec	23 Feb 2009 12:46:11 -0000	1.1822
+++ openoffice.org.spec	23 Feb 2009 15:23:14 -0000	1.1823
@@ -127,6 +127,7 @@
 Patch54: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 Patch55: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
 Patch56: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+Patch57: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1588,6 +1589,7 @@
 %patch54 -p0 -b .ooo99427.sd.ensure-icons-state.patch
 %patch55 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
 %patch56 -p0 -b .ooo99529.sw.notrailingnewline.patch
+%patch57 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4101,6 +4103,7 @@
 * Mon Feb 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.2
 - 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
 
 * Fri Feb 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.1
 - next milestone