rpms/openoffice.org/F-9 openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch, 1.1, 1.2 openoffice.org.spec, 1.1481, 1.1482

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20205

Modified Files:
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#446005 there's something very wrong with gcc methings

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

Index: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch	10 Mar 2008 09:43:36 -0000	1.1
+++ openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch	12 May 2008 16:25:37 -0000	1.2
@@ -5,36 +5,22 @@
 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++ )
+@@ -789,9 +789,9 @@
  			{
--				::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;
+ 				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
+ 				aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+-				uno::Reference< io::XStream > xCachedCopyStream;
  				try
  				{
++					uno::Reference< io::XStream > xCachedCopyStream;
+ 					if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() )
+ 					{
+ 						xResult = TryToGetAcceptableFormat_Impl( xCachedCopyStream );
+@@ -808,6 +808,7 @@
+ 					aStreamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\001Ole10Native" ) );
+ 					try
+ 					{
++						uno::Reference< io::XStream > xCachedCopyStream;
+ 						if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() )
+ 						{
+ 							xResult = TryToGetAcceptableFormat_Impl( xCachedCopyStream );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1481
retrieving revision 1.1482
diff -u -r1.1481 -r1.1482
--- openoffice.org.spec	12 May 2008 08:43:46 -0000	1.1481
+++ openoffice.org.spec	12 May 2008 16:25:37 -0000	1.1482
@@ -2910,10 +2910,12 @@
 
 
 %changelog
-* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.9-UNRELEASED
+* Mon May 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.9
 - Resolves: rhbz#444571 add openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
 - Resolves: rhbz#445318 fix notes related crash
 - Resolves: rhbz#445953 backport 2.4.1 ww8 bidi digit fixes
+- Resolves: rhbz#446005 there's something very wrong here, but every
+  attempt to isolate it makes it go away
 - add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 
 * Sat Apr 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.8