rpms/openoffice.org/devel openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch, NONE, 1.1 openoffice.org.spec, 1.1606, 1.1607

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch 
Log Message:
Resolves: rhbz#457938 openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch

openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch:

--- NEW FILE openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch ---
Index: core/drawdoc3.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/core/drawdoc3.cxx,v
retrieving revision 1.51
diff -u -r1.51 drawdoc3.cxx
--- openoffice.org.orig/sd/core/drawdoc3.cxx	10 Apr 2008 18:36:46 -0000	1.51
+++ openoffice.org/sd/core/drawdoc3.cxx	7 Aug 2008 10:49:42 -0000
@@ -1615,7 +1620,15 @@
 						pMySheet = static_cast<SfxStyleSheet*>( &mxStyleSheetPool->Make(aName, SD_STYLE_FAMILY_MASTERPAGE, pHisSheet->GetMask()) );
 						pMySheet->GetItemSet().ClearItem(0);  // alle loeschen
 						pMySheet->GetItemSet().Put(pHisSheet->GetItemSet());
+
+                    	SdStyleSheet* pOldStyle = static_cast< SdStyleSheet* >( pHisSheet  );
+                    	SdStyleSheet* pNewStyle = static_cast< SdStyleSheet* >( pMySheet );
+
+						if (pOldStyle->GetApiName() != rtl::OUString(pOldStyle->GetName()))
+							pNewStyle->SetApiName(pOldStyle->GetApiName());
+
 						aCreatedStyles.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( pMySheet ) ) );
+
 					}
 
 					StyleReplaceData* pReplData = new StyleReplaceData;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1606
retrieving revision 1.1607
diff -u -r1.1606 -r1.1607
--- openoffice.org.spec	7 Aug 2008 08:37:35 -0000	1.1606
+++ openoffice.org.spec	7 Aug 2008 10:55:37 -0000	1.1607
@@ -108,6 +108,7 @@
 Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 Patch37: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 Patch38: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
+Patch39: openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1273,6 +1274,7 @@
 %patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 %patch37 -p1 -b .ooo92253.dbaccess.a11y.crash
 %patch38 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
+%patch39 -p1 -b .ooo92522.sd.brokentemplates.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2626,7 +2628,7 @@
 %preun core
 if [ $1 -eq 0 ]; then
     # not upgrading => remove component cache
-    rm -rf %{baseinstdir}/share/uno_packages/cache/* || :
+    %{__rm} -rf %{baseinstdir}/share/uno_packages/cache/* || :
 fi
 
 %files brand
@@ -3598,6 +3600,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Aug 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-1.2
+- Resolves: rhbz#457938 openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch
+
 * Tue Aug 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-1.1
 - release branch
 - drop integrated openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch