rpms/openoffice.org/devel openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch, NONE, 1.1 openoffice.org.spec, 1.1442, 1.1443

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Mon Mar 10 09:44:24 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch 
Log Message:
Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch

openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.36
diff -u -r1.36 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx	6 Jul 2007 10:10:50 -0000	1.36
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx	10 Mar 2008 09:35:36 -0000
@@ -664,8 +664,8 @@
 
 	for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 	{
-		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-		aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) + 
+			::rtl::OUString::valueOf( (sal_Int32)nInd );
 		if ( xNameContainer->hasByName( aStreamName ) )
 			xNameContainer->removeByName( aStreamName );
 	}
@@ -737,8 +737,8 @@
 				{
 					for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
 					{
-						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-						aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+							::rtl::OUString::valueOf( (sal_Int32)nInd );
 						try
 						{
 							bExists = xNameContainer->hasByName( aStreamName );
@@ -787,8 +787,8 @@
 		{
 			for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 			{
-				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-				aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+					rtl::OUString::valueOf( (sal_Int32)nInd );
 				uno::Reference< io::XStream > xCachedCopyStream;
 				try
 				{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -r1.1442 -r1.1443
--- openoffice.org.spec	9 Mar 2008 20:25:48 -0000	1.1442
+++ openoffice.org.spec	10 Mar 2008 09:43:36 -0000	1.1443
@@ -144,6 +144,7 @@
 Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1101,6 +1102,7 @@
 %patch70 -p1 -b .ooo86123.ucb.newneon.patch
 %patch71 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2875,6 +2877,7 @@
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names
 - drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate




More information about the fedora-extras-commits mailing list