6308565
From 5b28f3488a033bd38b31071463b112df1713b64b Mon Sep 17 00:00:00 2001
6308565
From: Thorsten Behrens <tbehrens@suse.com>
6308565
Date: Wed, 15 Feb 2012 16:51:52 +0100
6308565
Subject: [PATCH] Fix fdo#45177 - avoid linked undo for the while.
6308565
6308565
While I try to wrap head around subtleties for linked undo in
6308565
Impress outline view, disable that here for the while. Better than
6308565
a crash for sure.
6308565
(cherry picked from commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3)
6308565
6308565
Conflicts:
6308565
6308565
	sd/source/ui/view/outlview.cxx
6308565
---
6308565
 sd/source/ui/view/outlview.cxx |    6 ------
6308565
 1 files changed, 0 insertions(+), 6 deletions(-)
6308565
6308565
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
6308565
index 53ebbb4..cdd442d 100644
6308565
--- a/sd/source/ui/view/outlview.cxx
6308565
+++ b/sd/source/ui/view/outlview.cxx
6308565
@@ -1672,12 +1672,6 @@ void OutlineView::EndModelChange()
6308565
 
6308565
     DBG_ASSERT( bHasUndoActions == (mpOutliner->GetUndoManager().GetUndoActionCount() != 0), "sd::OutlineView::EndModelChange(), undo actions not in sync!" );
6308565
 
6308565
-    if( bHasUndoActions )
6308565
-    {
6308565
-        SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
6308565
-        mpOutliner->GetUndoManager().AddUndoAction(pLink);
6308565
-    }
6308565
-
6308565
     mpOutliner->GetUndoManager().LeaveListAction();
6308565
 
6308565
     if( bHasUndoActions && mpOutliner->GetEditEngine().HasTriedMergeOnLastAddUndo() )
6308565
-- 
6308565
1.7.7.6
6308565