rpms/openoffice.org/devel workspace.impresscomments1.patch, NONE, 1.1 openoffice.org.spec, 1.2171, 1.2172 openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26076

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impresscomments1.patch 
Removed Files:
	openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch 
Log Message:
sync with accepted upstream workspace

workspace.impresscomments1.patch:
 svdpntv.cxx |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE workspace.impresscomments1.patch ---
diff -ru svx.orig/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpntv.cxx
--- svx.orig/source/svdraw/svdpntv.cxx	2010-02-04 11:40:05.000000000 +0000
+++ svx/source/svdraw/svdpntv.cxx	2010-02-04 14:25:45.000000000 +0000
@@ -296,6 +296,8 @@
 SdrPaintView::~SdrPaintView()
 {
 	DBG_DTOR(SdrPaintView,NULL);
+        if (pDefaultStyleSheet)
+            EndListening(*pDefaultStyleSheet);
 	EndListening( maColorConfig );
 	ClearPageView();
 
@@ -319,8 +321,16 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
+void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
+    //If the stylesheet has been destroyed
+    if (&rBC == pDefaultStyleSheet)
+    {
+        if (rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING)
+            pDefaultStyleSheet = NULL;
+        return;
+    }
+
 	BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
 	if (bObjChg) {
 		SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
@@ -1240,7 +1250,12 @@
 
 void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
 {
-	pDefaultStyleSheet=pStyleSheet;
+    if (pDefaultStyleSheet)
+        EndListening(*pDefaultStyleSheet);
+    pDefaultStyleSheet=pStyleSheet;
+    if (pDefaultStyleSheet)
+        StartListening(*pDefaultStyleSheet);
+
 	if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
 		SfxWhichIter aIter(pStyleSheet->GetItemSet());
 		USHORT nWhich=aIter.FirstWhich();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2171
retrieving revision 1.2172
diff -u -p -r1.2171 -r1.2172
--- openoffice.org.spec	10 Mar 2010 15:39:00 -0000	1.2171
+++ openoffice.org.spec	12 Mar 2010 10:38:37 -0000	1.2172
@@ -130,7 +130,7 @@ Patch57: workspace.cmcfixes70.patch
 Patch58: workspace.s390xport02.patch
 Patch59: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
 Patch60: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch61: openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch
+Patch61: workspace.impresscomments1.patch
 Patch62: openoffice.org-3.2.0.ooo109009.sc.tooltipcrash.patch
 Patch63: workspace.x86_64_bridgefix.patch
 Patch64: openoffice.org-3.2.0.ooo109210.sd.allpagesbg.patch
@@ -1682,7 +1682,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch58 -p1 -b .workspace.s390xport02.patch
 %patch59 -p1 -b .ooo108637.sfx2.uisavedir.patch
 %patch60 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch61 -p0 -b .ooo108976.svx.safestyledelete.patch
+%patch61 -p0 -b .workspace.impresscomments1.patch
 %patch62 -p0 -b .ooo109009.sc.tooltipcrash.patch
 %patch63 -p0 -b .workspace.x86_64_bridgefix.patch
 %patch64 -p0 -b .ooo109210.sd.allpagesbg.patch


--- openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch DELETED ---