fs34b: #i117039# restore old behavior of SfxUndoManager::EnableUndo: don't count the calls, but maintain a simple flag.

Consequently, let sw's UndoManager simply delegate now, and change the UndoManagerHelper to maintain a lock counter itself.

1 files changed, 3 insertions, 6 deletions

diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 18dc5b654d29..76f6660d4f02 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -402,12 +402,9 @@ SwUndo * UndoManager::RemoveLastUndo()
 
 void UndoManager::EnableUndo(bool bEnable)
 {
-    // UGLY: SfxUndoManager has a counter to match enable/disable calls
-    //       but the writer code expects that a single call switches
-    while (IsUndoEnabled() != bEnable)
-    {
-        SfxUndoManager::EnableUndo(bEnable);
-    }
+    // SfxUndoManager does not have a counter anymore, but reverted to the old behavior of
+    // having a simple boolean flag for locking. So, simply forward.
+    SfxUndoManager::EnableUndo(bEnable);
 }
 
 void UndoManager::AddUndoAction(SfxUndoAction *pAction, sal_Bool bTryMerge)