[Libreoffice-commits] core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/svdfppt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3247348d614573ddc1f1940d88e1d2b2b569027b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 12:27:27 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 6 17:46:16 2020 +0100

    ofz#20523 timeout, don't generate undo data during import
    
    Change-Id: Id56901a6bf4da7bc8fbdcbcc811f6afb2121fe07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88015
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index e093597c5961..e704e423ee08 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2228,6 +2228,9 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
     {
         TSS_Type nDestinationInstance = pTextObj->GetDestinationInstance() ;
         SdrOutliner& rOutliner = pText->ImpGetDrawOutliner();
+        bool bUndoEnabled = rOutliner.IsUndoEnabled();
+        rOutliner.EnableUndo(false);
+
         if ( ( pText->GetObjInventor() == SdrInventor::Default ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL)
             rOutliner.Init( OutlinerMode::TitleObject );             // Outliner reset
 
@@ -2343,6 +2346,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
         std::unique_ptr<OutlinerParaObject> pNewText = rOutliner.CreateParaObject();
         rOutliner.Clear();
         rOutliner.SetUpdateMode( bOldUpdateMode );
+        rOutliner.EnableUndo(bUndoEnabled);
         pText->SetOutlinerParaObject( std::move(pNewText) );
     }
     return pText;