summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-10-30 12:11:09 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-07 10:45:13 +0100
commit3956a8483852ec3df3a792ea67d8a8da2b3b7267 (patch)
tree93faf1094e009259efb0a289318f2058334ecdaf /svx
parentcf78f9c05aaef427c3907ebb7a2ce7247ed27273 (diff)
SdrUndoDelObj: one more manual swap out call
This thing seems a good optimization to me, but it would be good to hide all of this swapping thing inside GraphicObject class, to make our code more robust (e.g. no image loss because of missing manual swap in / swap out call). Auto swapping mechanism will take care of that, anyway. Change-Id: I933dafd95597ffff038dc6aeb0a64fcaa3941bd8
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdundo.cxx28
1 files changed, 0 insertions, 28 deletions
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index e8a84e52de82..c88d2c303a93 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -889,34 +889,10 @@ void SdrUndoInsertObj::Redo()
ImpShowPageOfThisObject();
}
-
-
-void SdrUndoDelObj::TryToFlushGraphicContent()
-{
- SdrGrafObj* pSdrGrafObj = dynamic_cast< SdrGrafObj* >(pObj);
-
- if(pSdrGrafObj)
- {
- sdr::contact::ViewContactOfGraphic* pVC = dynamic_cast< sdr::contact::ViewContactOfGraphic* >(&pSdrGrafObj->GetViewContact());
-
- if(pVC)
- {
- pVC->flushViewObjectContacts();
- pVC->flushGraphicObjects();
- }
-
- pSdrGrafObj->ForceSwapOut();
- }
-}
-
SdrUndoDelObj::SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect)
: SdrUndoRemoveObj(rNewObj,bOrdNumDirect)
{
SetOwner(true);
-
- // #i122985# if graphic object is deleted (but goes to undo) flush it's graphic content
- // since it is potentially no longer needed
- TryToFlushGraphicContent();
}
void SdrUndoDelObj::Undo()
@@ -931,10 +907,6 @@ void SdrUndoDelObj::Redo()
SdrUndoRemoveObj::Redo();
DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj already belongs to UndoAction");
SetOwner(true);
-
- // #i122985# if graphic object is deleted (but goes to undo) flush it's graphic content
- // since it is potentially no longer needed
- TryToFlushGraphicContent();
}
OUString SdrUndoDelObj::GetComment() const