diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-06-30 16:13:06 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-06-30 17:14:56 +0200 |
commit | 3d59018b1ed816b4399cad4c2c4818cf25d4f4a1 (patch) | |
tree | fb0c570b84b4d805dc3d91ac58c60df2575e7269 | |
parent | b2b085441dc79fb78607dbf1969c12a40db58214 (diff) |
tdf#108833 sd: don't unconditionally enable Undo after import
Change-Id: Id637e649ccf3782658832d909b3a7150a0606229
-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 38ef1d3f6341..4eed0b02cc38 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(); @@ -769,7 +770,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) fixupOutlinePlaceholderNumberingDepths(pDoc); - pDoc->EnableUndo(true); + pDoc->EnableUndo(bWasUndo); mrDocShell.ClearUndoBuffer(); return nRet == ERRCODE_NONE; } |