diff options
| -rw-r--r-- | svl/source/items/style.cxx | 21 | ||||
| -rw-r--r-- | svx/inc/svx/svdundo.hxx | 11 | ||||
| -rw-r--r-- | svx/source/svdraw/svdundo.cxx | 53 |
3 files changed, 63 insertions, 22 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 6df5bfa71b6e..ea08cc309e51 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -765,14 +765,19 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p ) // Alle Styles umsetzen, deren Parent dieser hier ist ChangeParent( p->GetName(), p->GetParent() ); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY ); - if( xComp.is() ) try - { - xComp->dispose(); - } - catch( com::sun::star::uno::Exception& ) - { - } + // #120015# Do not dispose, the removed StyleSheet may still be used in + // existing SdrUndoAttrObj incarnations. Rely on refcounting for disposal, + // this works well under normal conditions (checked breaking and counting + // on SfxStyleSheetBase constructors and destructors) + // + // com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY ); + // if( xComp.is() ) try + // { + // xComp->dispose(); + // } + // catch( com::sun::star::uno::Exception& ) + // { + // } aStyles.erase(aIter); Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) ); diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 22211640e148..78d9a9c5a439 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -22,8 +22,9 @@ #include <svl/solar.hrc> #include <svl/undo.hxx> +#include <svl/style.hxx> #include <tools/gen.hxx> -#include <svx/svdtypes.hxx> // fuer enum RepeatFuncts +#include <svx/svdtypes.hxx> // for enum RepeatFuncts #include <svx/svdsob.hxx> #include "svx/svxdllapi.h" @@ -159,9 +160,8 @@ protected: SfxItemSet* pRepeatSet; // oder besser den StyleSheetNamen merken? - SfxStyleSheet* pUndoStyleSheet; - SfxStyleSheet* pRedoStyleSheet; - SfxStyleSheet* pRepeatStyleSheet; + rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet; + rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet; bool bStyleSheet; bool bHaveToTakeRedoSet; @@ -174,6 +174,9 @@ protected: // Wenn sich um ein Gruppenobjekt handelt: SdrUndoGroup* pUndoGroup; + // helper to ensure StyleSheet is in pool (provided by SdrModel from SdrObject) + void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet); + public: SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c1e4b4dd1ff9..c4e3c294b1f1 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -246,16 +246,29 @@ void SdrUndoObj::ImpShowPageOfThisObject() } } -//////////////////////////////////////////////////////////////////////////////////////////////////// +void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet) +{ + SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(), rSheet.GetFamily()); + + if(!pThere) + { + // re-insert remembered style which was removed in the meantime. To do this + // without assertion, do it without parent and set parent after insertion + const UniString aParent(rSheet.GetParent()); + + rSheet.SetParent(UniString()); + rStyleSheetPool.Insert(&rSheet); + rSheet.SetParent(aParent); + } +} SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSaveText) : SdrUndoObj(rNewObj), pUndoSet(NULL), pRedoSet(NULL), pRepeatSet(NULL), - pUndoStyleSheet(NULL), - pRedoStyleSheet(NULL), - pRepeatStyleSheet(NULL), + mxUndoStyleSheet(), + mxRedoStyleSheet(), bHaveToTakeRedoSet(sal_True), pTextUndo(NULL), @@ -288,7 +301,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave pUndoSet = new SfxItemSet(pObj->GetMergedItemSet()); if(bStyleSheet) - pUndoStyleSheet = pObj->GetStyleSheet(); + mxUndoStyleSheet = pObj->GetStyleSheet(); if(bSaveText) { @@ -339,7 +352,7 @@ void SdrUndoAttrObj::Undo() pRedoSet = new SfxItemSet(pObj->GetMergedItemSet()); if(bStyleSheet) - pRedoStyleSheet=pObj->GetStyleSheet(); + mxRedoStyleSheet = pObj->GetStyleSheet(); if(pTextUndo) { @@ -353,8 +366,18 @@ void SdrUndoAttrObj::Undo() if(bStyleSheet) { - pRedoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pUndoStyleSheet, sal_True); + mxRedoStyleSheet = pObj->GetStyleSheet(); + SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet* >(mxUndoStyleSheet.get()); + + if(pSheet && pObj->GetModel() && pObj->GetModel()->GetStyleSheetPool()) + { + ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(), *pSheet); + pObj->SetStyleSheet(pSheet, sal_True); + } + else + { + OSL_ENSURE(false, "OOps, something went wrong in SdrUndoAttrObj (!)"); + } } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); @@ -426,8 +449,18 @@ void SdrUndoAttrObj::Redo() { if(bStyleSheet) { - pUndoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pRedoStyleSheet, sal_True); + mxUndoStyleSheet = pObj->GetStyleSheet(); + SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet* >(mxRedoStyleSheet.get()); + + if(pSheet && pObj->GetModel() && pObj->GetModel()->GetStyleSheetPool()) + { + ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(), *pSheet); + pObj->SetStyleSheet(pSheet, sal_True); + } + else + { + OSL_ENSURE(false, "OOps, something went wrong in SdrUndoAttrObj (!)"); + } } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); |