sd/source/filter/xml/sdxmlwrp.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit f6e84702699ce8c48ae669d9d50aa56f78a05ea1 Author: Michael Stahl <mst...@redhat.com> Date: Fri Jun 30 16:13:06 2017 +0200 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 <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> 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; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits