rpms/openoffice.org/F-11 workspace.chart41.patch, NONE, 1.1 openoffice.org.spec, 1.1937, 1.1938

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.chart41.patch 
Log Message:
Resolves: rhbz#531554 add workspace.chart41.patch (caolanm)

workspace.chart41.patch:
 xmleohlp.cxx |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE workspace.chart41.patch ---
diff -r b35923844c43 -r edc399361b6d svx/source/xml/xmleohlp.cxx
--- a/svx/source/xml/xmleohlp.cxx	Mon Sep 14 10:36:01 2009 +0000
+++ b/svx/source/xml/xmleohlp.cxx	Mon Sep 14 11:57:16 2009 +0000
@@ -326,11 +326,29 @@
 		}
 		else
 		{
-			sal_Int32 nPathStart = 0;
-			if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
-				nPathStart = 2;
-			if( _nPos >= nPathStart )
-				rContainerStorageName = aURLNoPar.copy( nPathStart, _nPos-nPathStart);
+            //eliminate 'superfluous' slashes at start and end
+            //#i103076# load objects with all allowed xlink:href syntaxes
+            {
+                //eliminate './' at start
+			    sal_Int32 nStart = 0;
+                sal_Int32 nCount = aURLNoPar.getLength();
+			    if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
+                {
+				    nStart = 2;
+                    nCount -= 2;
+                }
+
+                //eliminate '/' at end
+                sal_Int32 nEnd = aURLNoPar.lastIndexOf( '/' );
+                if( nEnd == aURLNoPar.getLength()-1 && nEnd != (nStart-1) )
+                    nCount--;
+
+                aURLNoPar = aURLNoPar.copy( nStart, nCount );
+            }
+
+            _nPos = aURLNoPar.lastIndexOf( '/' );
+            if( _nPos >= 0 )
+				rContainerStorageName = aURLNoPar.copy( 0, _nPos );
 			rObjectStorageName = aURLNoPar.copy( _nPos+1 );
 		}
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1937
retrieving revision 1.1938
diff -u -p -r1.1937 -r1.1938
--- openoffice.org.spec	21 Oct 2009 09:04:37 -0000	1.1937
+++ openoffice.org.spec	28 Oct 2009 20:37:16 -0000	1.1938
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -158,6 +158,7 @@ Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.aw073.patch
 Patch85: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch86: workspace.chart41.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1674,6 +1675,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.aw073.patch
 %patch85 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch86 -p1 -b .workspace.chart41.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4177,6 +4179,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
+- Resolves: rhbz#531554 add workspace.chart41.patch
+
 * Wed Oct 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - Resolves: rhbz#522839 crash on exit after loading .doc
 - Resolves: rhbz#529746 crash on exit after loading .ppt