summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-06-20 08:17:23 +0000
committerThorsten Behrens <tbehrens@suse.com>2013-04-30 17:18:32 +0200
commitf57fbde51a16d3d7f73eba67420a506d82e16cda (patch)
tree76475fc765ed6be621ed1698acbc7aac1709d894 /svx/source/svdraw
parentff3ce21011beda7c835db0979292d29dfa832d6b (diff)
i#120015# Let SdrUndoAttrObj remember a reference to the used style to survive
removal of the style by UI (which creates no undo actions). Re-add the style when undoing if needed. Change-Id: I6069a1cb42dfaeb0dd35fdc15687fd307f2b641e (cherry picked from commit 4c8ffa01131f2df2b314218731d83bd776944802) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdundo.cxx53
1 files changed, 43 insertions, 10 deletions
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);