rpms/openoffice.org/devel openoffice.org-1.9.84.ooo44843.sdcasting.patch, 1.2, 1.3 openoffice.org.spec, 1.475, 1.476

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16135

Modified Files:
	openoffice.org-1.9.84.ooo44843.sdcasting.patch 
	openoffice.org.spec 
Log Message:
extend workaround

openoffice.org-1.9.84.ooo44843.sdcasting.patch:
 bf_sd/source/ui/app/sd_optsitem.cxx           |    0 
 binfilter/bf_sd/source/ui/app/sd_optsitem.cxx |    4 +++-
 sd/source/ui/app/optsitem.cxx                 |   26 +++++++++++++++++++-------
 source/ui/app/optsitem.cxx                    |    0 
 4 files changed, 22 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.84.ooo44843.sdcasting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.84.ooo44843.sdcasting.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.84.ooo44843.sdcasting.patch	13 Jun 2005 09:16:24 -0000	1.2
+++ openoffice.org-1.9.84.ooo44843.sdcasting.patch	19 Sep 2005 10:01:54 -0000	1.3
@@ -1,21 +1,3 @@
-Index: source/ui/app/optsitem.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
-retrieving revision 1.31
-diff -u -p -r1.31 optsitem.cxx
---- openoffice.org.orig/sd/source/ui/app/optsitem.cxx	27 Jan 2005 14:12:09 -0000	1.31
-+++ openoffice.org/sd/source/ui/app/optsitem.cxx	11 Mar 2005 20:25:17 -0000
-@@ -1712,7 +1712,9 @@ SfxPoolItem* SdOptionsPrintItem::Clone( 
- int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
- {
- 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
--	return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
-+	const SdOptionsPrintItem& rRHS = 
-+		dynamic_cast<const SdOptionsPrintItem&>(rAttr);
-+	return SdOptionsPrint::operator==(rRHS);
- }
- 
- // -----------------------------------------------------------------------
 Index: bf_sd/source/ui/app/sd_optsitem.cxx
 ===================================================================
 RCS file: /cvs/framework/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx,v
@@ -34,3 +16,85 @@
  /*N*/ }
  
  // -----------------------------------------------------------------------
+Index: source/ui/app/optsitem.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
+retrieving revision 1.32
+diff -u -p -u -r1.32 optsitem.cxx
+--- openoffice.org.orig/sd/source/ui/app/optsitem.cxx	9 Sep 2005 03:43:01 -0000	1.32
++++ openoffice.org/sd/source/ui/app/optsitem.cxx	19 Sep 2005 09:58:05 -0000
+@@ -126,7 +126,7 @@ void SdOptionsGeneric::Init() const
+ {
+ 	if( !mbInit )
+ 	{
+-		SdOptionsGeneric* pThis	= (SdOptionsGeneric*) this;
++		SdOptionsGeneric* pThis	= const_cast<SdOptionsGeneric*>(this);
+ 
+ 		if( !mpCfgItem )
+ 			pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree );
+@@ -379,7 +379,9 @@ SfxPoolItem* SdOptionsLayoutItem::Clone(
+ int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unterschiedliche Typen" );
+-	return( (SdOptionsLayout&) *this == (const SdOptionsLayout&)(const SdOptionsLayoutItem&) rAttr );
++	const SdOptionsLayoutItem& rRHS = 
++		dynamic_cast<const SdOptionsLayoutItem&>(rAttr);
++	return SdOptionsLayout::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -522,7 +524,9 @@ SfxPoolItem* SdOptionsContentsItem::Clon
+ int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+-	return( (SdOptionsContents&) *this == (const SdOptionsContents&)(const SdOptionsContentsItem&) rAttr );
++	const SdOptionsContentsItem& rRHS = 
++		dynamic_cast<const SdOptionsContentsItem&>(rAttr);
++	return SdOptionsContents::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -850,7 +854,9 @@ SfxPoolItem* SdOptionsMiscItem::Clone( S
+ int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+-	return( (SdOptionsMisc&) *this == (const SdOptionsMisc&)(const SdOptionsMiscItem&) rAttr );
++	const SdOptionsMiscItem& rRHS = 
++		dynamic_cast<const SdOptionsMiscItem&>(rAttr);
++	return SdOptionsMisc::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -1060,7 +1066,9 @@ SfxPoolItem* SdOptionsSnapItem::Clone( S
+ int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+-	return( (SdOptionsSnap&) *this == (const SdOptionsSnap&)(const SdOptionsSnapItem&) rAttr );
++	const SdOptionsSnapItem& rRHS = 
++		dynamic_cast<const SdOptionsSnapItem&>(rAttr);
++	return SdOptionsSnap::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -1195,7 +1203,9 @@ SfxPoolItem* SdOptionsZoomItem::Clone( S
+ int SdOptionsZoomItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+-	return( (SdOptionsZoom&) *this == (const SdOptionsZoom&)(const SdOptionsZoomItem&) rAttr );
++	const SdOptionsZoomItem& rRHS = 
++		dynamic_cast<const SdOptionsZoomItem&>(rAttr);
++	return SdOptionsZoom::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -1686,7 +1696,9 @@ SfxPoolItem* SdOptionsPrintItem::Clone( 
+ int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+-	return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
++	const SdOptionsPrintItem& rRHS = 
++		dynamic_cast<const SdOptionsPrintItem&>(rAttr);
++	return SdOptionsPrint::operator==(rRHS);
+ }
+ 
+ // -----------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- openoffice.org.spec	19 Sep 2005 07:20:04 -0000	1.475
+++ openoffice.org.spec	19 Sep 2005 10:01:55 -0000	1.476
@@ -3217,6 +3217,7 @@
 %changelog
 * Mon Sep 19 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1.scratch
 - add openoffice.org-1.9.130.ooo54708.sc.patch
+- workaround for gcc#22132# for rh#168537#
 
 * Thu Sep 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1
 - next version