rpms/openoffice.org/devel workspace.impress152.patch, NONE, 1.1 openoffice.org.spec, 1.1618, 1.1619 openoffice.org-3.0.0.ooo91977.sd.holdreference.patch, 1.2, NONE openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress152.patch 
Removed Files:
	openoffice.org-3.0.0.ooo91977.sd.holdreference.patch 
	openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch 
Log Message:
merge sd upstream accepted into 3.0 patches

workspace.impress152.patch:

--- NEW FILE workspace.impress152.patch ---
Index: graphics/svx/source/unodraw/unopage.cxx
diff -u graphics/svx/source/unodraw/unopage.cxx:1.47 graphics/svx/source/unodraw/unopage.cxx:1.47.74.1
--- graphics/svx/source/unodraw/unopage.cxx:1.47	Tue Jul  1 06:43:50 2008
+++ graphics/svx/source/unodraw/unopage.cxx	Wed Aug 13 08:30:39 2008
@@ -967,6 +967,14 @@
 			StartListening( *pNewModel );
 
 		mpModel = pNewModel;
+
+        if( mpView )
+        {
+            delete mpView;
+	        mpView = new SdrView( mpModel );
+	        if( mpView )
+		        mpView->SetDesignMode(sal_True);
+        }
 	}
 }
 
Index: graphics/sd/source/core/drawdoc3.cxx
diff -u graphics/sd/source/core/drawdoc3.cxx:1.51 graphics/sd/source/core/drawdoc3.cxx:1.51.100.1
--- graphics/sd/source/core/drawdoc3.cxx:1.51	Thu Apr 10 11:36:46 2008
+++ graphics/sd/source/core/drawdoc3.cxx	Wed Aug 13 08:40:03 2008
@@ -1611,10 +1611,13 @@
 					}
 					else
 					{
-					   // So eine Vorlage erzeugen
+					    // create new style
+                        String aHelpFile;
 						pMySheet = static_cast<SfxStyleSheet*>( &mxStyleSheetPool->Make(aName, SD_STYLE_FAMILY_MASTERPAGE, pHisSheet->GetMask()) );
+                        pMySheet->SetHelpId( aHelpFile, pHisSheet->GetHelpId(aHelpFile) );
 						pMySheet->GetItemSet().ClearItem(0);  // alle loeschen
 						pMySheet->GetItemSet().Put(pHisSheet->GetItemSet());
+
 						aCreatedStyles.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( pMySheet ) ) );
 					}
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1618
retrieving revision 1.1619
diff -u -r1.1618 -r1.1619
--- openoffice.org.spec	12 Aug 2008 08:21:18 -0000	1.1618
+++ openoffice.org.spec	13 Aug 2008 15:59:58 -0000	1.1619
@@ -104,12 +104,11 @@
 Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch35: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch35: workspace.impress152.patch
 Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 Patch37: workspace.dba301a.patch
 Patch38: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
-Patch39: openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch
-Patch40: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
+Patch39: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1271,12 +1270,11 @@
 %patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch33 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch34 -p1 -b .ooo86142.serbiannumbering.patch
-%patch35 -p1 -b .ooo91977.sd.holdreference.patch
+%patch35 -p1 -b .workspace.impress152.patch
 %patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 %patch37 -p1 -b .workspace.dba301a.patch
 %patch38 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
-%patch39 -p1 -b .ooo92522.sd.brokentemplates.patch
-%patch40 -p1 -b .ooo91904.sd.wrongindex.patch
+%patch39 -p1 -b .ooo91904.sd.wrongindex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3603,7 +3601,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Aug 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.2
+* Wed Aug 13 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.2
 - Resolves: rhbz#458681 python requires
 - Resolves: rhbz#458739 icon generation sequence
 - update to upstream dbaccess a11y solution


--- openoffice.org-3.0.0.ooo91977.sd.holdreference.patch DELETED ---


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