diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-09-01 18:26:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-02 19:08:49 +0200 |
| commit | c1c679deca078209bc3008ccd9ccc0a8715929a1 (patch) | |
| tree | 6f5a1a1207636b4b7f1b0575f36cbf579f7c85af /filter | |
| parent | 58da51715425d781b5b8b9b9e412c98daf80b601 (diff) | |
rename UpdateMode -> UpdateLayout in editeng class
... because "update" is such a generic term I keep forgetting what we
are turning on and off
Also return the previous value from SetUpdateLayout to
make the save/restore code more compact.
Change-Id: Iae1764c837a92e58c9b17521f130e8fc80311d22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121479
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 10 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index dc03c9355261..c86e56fca8d4 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3619,8 +3619,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) SdrOutliner& rOutliner = pText->ImpGetDrawOutliner(); rOutliner.Init( OutlinerMode::TextObject ); - bool bOldUpdateMode = rOutliner.GetUpdateMode(); - rOutliner.SetUpdateMode( false ); + bool bOldUpdateMode = rOutliner.SetUpdateLayout( false ); rOutliner.SetVertical( pText->IsVerticalWriting() ); sal_Int32 nParaIndex = 0; @@ -3666,7 +3665,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) } std::optional<OutlinerParaObject> pNewText = rOutliner.CreateParaObject(); rOutliner.Clear(); - rOutliner.SetUpdateMode( bOldUpdateMode ); + rOutliner.SetUpdateLayout( bOldUpdateMode ); pText->SetOutlinerParaObject( std::move(pNewText) ); // tdf#143315: restore stylesheet applied to Outliner's nodes when SdrTextObj initializes // its attributes, but removed by Outliner::Init, which calls Outliner::Clear. @@ -4471,9 +4470,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if ( pParaObj ) { SdrOutliner& rOutliner = static_cast<SdrObjCustomShape*>(pRet)->ImpGetDrawOutliner(); - bool bOldUpdateMode = rOutliner.GetUpdateMode(); rOutliner.SetStyleSheetPool(static_cast< SfxStyleSheetPool* >(pRet->getSdrModelFromSdrObject().GetStyleSheetPool())); - rOutliner.SetUpdateMode( false ); + bool bOldUpdateMode = rOutliner.SetUpdateLayout( false ); rOutliner.SetText( *pParaObj ); ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT); pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM)); @@ -4501,7 +4499,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r } } rOutliner.Clear(); - rOutliner.SetUpdateMode( bOldUpdateMode ); + rOutliner.SetUpdateLayout( bOldUpdateMode ); } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d4bcb344c01f..33386122440b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2263,8 +2263,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* if ( ( pText->GetObjInventor() == SdrInventor::Default ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL) rOutliner.Init( OutlinerMode::TitleObject ); // Outliner reset - bool bOldUpdateMode = rOutliner.GetUpdateMode(); - rOutliner.SetUpdateMode( false ); + bool bOldUpdateMode = rOutliner.SetUpdateLayout( false ); if ( pSheet ) { if ( rOutliner.GetStyleSheet( 0 ) != pSheet ) @@ -2374,7 +2373,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* } std::optional<OutlinerParaObject> pNewText = rOutliner.CreateParaObject(); rOutliner.Clear(); - rOutliner.SetUpdateMode( bOldUpdateMode ); + rOutliner.SetUpdateLayout( bOldUpdateMode ); rOutliner.EnableUndo(bUndoEnabled); pText->SetOutlinerParaObject( std::move(pNewText) ); } |