summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-02-15 16:51:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-02-16 12:00:05 +0000
commit5b28f3488a033bd38b31071463b112df1713b64b (patch)
tree7a9ab784218311e3159219fd796c9f04935ad96f
parente21cd8ac21062485bc36f63998d2b15674c71a89 (diff)
Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in Impress outline view, disable that here for the while. Better than a crash for sure. (cherry picked from commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3) Conflicts: sd/source/ui/view/outlview.cxx
-rw-r--r--sd/source/ui/view/outlview.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 53ebbb429144..cdd442d143b1 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1672,12 +1672,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions == (mpOutliner->GetUndoManager().GetUndoActionCount() != 0), "sd::OutlineView::EndModelChange(), undo actions not in sync!" );
- if( bHasUndoActions )
- {
- SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
- mpOutliner->GetUndoManager().AddUndoAction(pLink);
- }
-
mpOutliner->GetUndoManager().LeaveListAction();
if( bHasUndoActions && mpOutliner->GetEditEngine().HasTriedMergeOnLastAddUndo() )