diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-11 18:45:21 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-29 13:13:17 +0200 |
| commit | 412f514365ce6646f6221768ed2c46206dd0c91f (patch) | |
| tree | a6127478b796497a6c404261aa4010b5e110b892 | |
| parent | d943d4faf92f0b86c25f3cd6fe77ed8a7d4905d1 (diff) | |
MM don't keep undo information
Doen't make much sense to store undo information for all merge
based progress. Actually it even prevents crahes when undoing a
merged ODT document.
Change-Id: Ic3a3982f3e5eb4f6de9f027a6a5e376c2833e8a5
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index d70b4b93ff5b..9642b265ee1e 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -78,6 +78,7 @@ #include <IDocumentLinksAdministration.hxx> #include <IDocumentContentOperations.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentUndoRedo.hxx> #include <swwait.hxx> #include <swunohelper.hxx> #include <dbui.hrc> @@ -990,6 +991,7 @@ static SfxObjectShell* lcl_CreateWorkingDocument( pWorkWrtShell->GetViewOptions()->SetIdle( false ); pWorkView->AttrChangedNotify( pWorkWrtShell );// in order for SelectShell to be called SwDoc* pWorkDoc = pWorkWrtShell->GetDoc(); + pWorkDoc->GetIDocumentUndoRedo().DoUndo( false ); pWorkDoc->ReplaceDocumentProperties( *pSourceDoc ); if( aType == WorkingDocType::TARGET ) @@ -1530,6 +1532,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, pTargetShell->CalcLayout(); SAL_INFO( "sw.pageframe", "MergeMailFiles pTargetShell->CalcLayout out)" ); pTargetShell->GetViewOptions()->SetIdle( true ); + pTargetDoc->GetIDocumentUndoRedo().DoUndo( true ); for ( auto aLayout : pTargetShell->GetDoc()->GetAllLayouts() ) { aLayout->FreezeLayout(false); |