diff options
| -rw-r--r-- | sw/source/core/undo/docundo.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/uno/unomod.cxx | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 79eb610a84e6..a2b92c738c30 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -407,12 +407,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) diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 25b09c895687..f8fbfdde04ca 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -782,6 +782,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c aOpt.setBrowseMode( bVal ); pView->GetWrtShell().ApplyViewOptions( aOpt ); pView->RecheckBrowseMode(); + + // must be set in mpViewOption as this will overwrite settings in _post! + mpViewOption->setBrowseMode( bVal ); + + // disable multiple layout + pView->GetDocShell()->ToggleBrowserMode(bVal, pView ); } } break; |