diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-30 16:13:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-04 12:30:44 +0200 |
| commit | f6e84702699ce8c48ae669d9d50aa56f78a05ea1 (patch) | |
| tree | ed0a9dcd8ba24853a83bc57f6539d9a19a9925cc | |
| parent | 0755d19069403ef16f55326c3a567ddf84d4d9ec (diff) | |
tdf#108833 sd: don't unconditionally enable Undo after import
Change-Id: Id637e649ccf3782658832d909b3a7150a0606229
(cherry picked from commit 3d59018b1ed816b4399cad4c2c4818cf25d4f4a1)
Reviewed-on: https://gerrit.libreoffice.org/39420
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index b84854e68b94..f435577fcf96 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -453,6 +453,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) comphelper::getProcessComponentContext(); SdDrawDocument* pDoc = mrDocShell.GetDoc(); + bool const bWasUndo(pDoc->IsUndoEnabled()); pDoc->EnableUndo(false); pDoc->NewOrLoadCompleted( NEW_DOC ); pDoc->CreateFirstPages(); @@ -780,7 +781,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) fixupOutlinePlaceholderNumberingDepths(pDoc); - pDoc->EnableUndo(true); + pDoc->EnableUndo(bWasUndo); mrDocShell.ClearUndoBuffer(); return nRet == 0; } |