sw/source/uibase/dbui/dbmgr.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit f4d9bc000100cd9231898ddf94c48d45cd9469b0
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Aug 11 18:45:21 2016 +0200
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.
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: Ic3a3982f3e5eb4f6de9f027a6a5e376c2833e8a5
Reviewed-on: https://gerrit.libreoffice.org/56023
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2f2e76a072c3..5ab4d70aaa9d 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -79,6 +79,7 @@
#include <IDocumentLinksAdministration.hxx>
#include <IDocumentContentOperations.hxx>
#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
#include <swwait.hxx>
#include <swunohelper.hxx>
#include <dbui.hrc>
@@ -993,6 +994,7 @@ static SfxObjectShell* lcl_CreateWorkingDocument(
SwWrtShell* pWorkWrtShell = pWorkView->GetWrtShellPtr();
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 )
@@ -1556,6 +1558,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
// Unfreeze target document layouts and correct all PageDescs.
pTargetShell->CalcLayout();
+ pTargetDoc->GetIDocumentUndoRedo().DoUndo( true );
for ( auto aLayout : pTargetShell->GetDoc()->GetAllLayouts() )
{
aLayout->FreezeLayout(false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
