rpms/openoffice.org/devel workspace.impress132.patch, NONE, 1.1 openoffice.org.spec, 1.1391, 1.1392

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress132.patch 
Log Message:
Resolves: rhbz#428655 workspace.impress132.patch

workspace.impress132.patch:

--- NEW FILE workspace.impress132.patch ---
Index: graphics/svx/source/unodraw/unoshape.cxx
diff -u graphics/svx/source/unodraw/unoshape.cxx:1.164 graphics/svx/source/unodraw/unoshape.cxx:1.164.76.1
--- graphics/svx/source/unodraw/unoshape.cxx:1.164	Tue Aug 28 06:45:51 2007
+++ graphics/svx/source/unodraw/unoshape.cxx	Wed Oct 31 06:52:27 2007
@@ -4611,7 +4611,7 @@
 /** returns the SdrObject from the given StarOffice API wrapper */
 SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) throw()
 {
-	SvxShape* pShape = dynamic_cast< SvxShape* >( xShape.get() );
+ 	SvxShape* pShape = SvxShape::getImplementation( xShape );
 	return pShape ? pShape->GetSdrObject() : 0;
 }
 
@@ -4619,6 +4619,6 @@
 
 SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt )
 {
-	SvxShape* pSvxShape = dynamic_cast< SvxShape* >( xInt.get() );
+ 	SvxShape* pSvxShape = SvxShape::getImplementation( xInt );
 	return pSvxShape ? pSvxShape->GetSdrObject() : 0;
 }
Index: graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx
diff -u graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx:1.2 graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx:1.2.148.1
--- graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx:1.2	Tue Apr  3 08:45:41 2007
+++ graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx	Wed Oct 31 05:19:54 2007
@@ -187,6 +187,7 @@
     }
 
     mpQueueProcessor.reset();
+    mpConfigurationUpdater.reset();
     mxRequestedConfiguration = NULL;
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1391
retrieving revision 1.1392
diff -u -r1.1391 -r1.1392
--- openoffice.org.spec	16 Jan 2008 11:27:12 -0000	1.1391
+++ openoffice.org.spec	16 Jan 2008 11:34:46 -0000	1.1392
@@ -138,6 +138,7 @@
 Patch64: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch65: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
 Patch66: workspace.sw8u10bf04.patch
+Patch67: workspace.impress132.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1090,6 +1091,7 @@
 %patch64 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch65 -p1 -b .ooo83410.solenv.renameserbian.patch
 %patch66 -p1 -b .workspace.sw8u10bf04.patch
+%patch67 -p1 -b .workspace.impress132.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2866,6 +2868,7 @@
 %changelog
 * Wed Jan 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.1
 - Resolves: rhbz#428655 workspace.sw8u10bf04.patch
+- Resolves: rhbz#428655 workspace.impress132.patch
 
 * Tue Jan 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-2.2
 - fix hyphenation