diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-05 12:27:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 17:46:16 +0100 |
| commit | 3247348d614573ddc1f1940d88e1d2b2b569027b (patch) | |
| tree | 06b82fbfb6f114d54337e77a046bc88cb14ca311 | |
| parent | 3eba9b681994129da5be5b03f9aaa1ab2b7583aa (diff) | |
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@redhat.com>
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; |