diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-07-14 16:46:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-16 08:39:11 +0200 |
| commit | 99876774fbcd5409ca6a6a15c44ecd39a117236f (patch) | |
| tree | cfec7927d18397bd9f3ff2dd8c87fafa57eb0ee2 /svx | |
| parent | 9df9e5b0a92caeda305c53214632a3ba42f02b2d (diff) | |
SvPersistBase no longer necessary
Change-Id: I928c0898d77d30bd6ca755d07acac6f78b20563b
Reviewed-on: https://gerrit.libreoffice.org/57436
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 12 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 17 |
2 files changed, 10 insertions, 19 deletions
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index e3d7aba47366..334f390756d7 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -111,12 +111,12 @@ namespace drawinglayer { const EditTextObject& rETO = maOutlinerParaObject.GetTextObject(); - mbContainsPageField = rETO.HasField(SvxPageField::StaticClassId()); - mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticClassId()); - mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticClassId()) - || rETO.HasField(SvxFooterField::StaticClassId()) - || rETO.HasField(SvxDateTimeField::StaticClassId()) - || rETO.HasField(SvxAuthorField::StaticClassId()); + mbContainsPageField = rETO.HasField(SvxPageField::CLASS_ID); + mbContainsPageCountField = rETO.HasField(SvxPagesField::CLASS_ID); + mbContainsOtherFields = rETO.HasField(SvxHeaderField::CLASS_ID) + || rETO.HasField(SvxFooterField::CLASS_ID) + || rETO.HasField(SvxDateTimeField::CLASS_ID) + || rETO.HasField(SvxAuthorField::CLASS_ID); } const SdrText* SdrTextPrimitive2D::getSdrText() const { return mrSdrText.get(); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 167b8e50825e..d40dadb35131 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1140,19 +1140,10 @@ void SdrTextObj::ImpCheckMasterCachable() if(!bNotVisibleAsMaster && pOutlinerParaObject && pOutlinerParaObject->IsEditDoc() ) { const EditTextObject& rText= pOutlinerParaObject->GetTextObject(); - bNotMasterCachable=rText.HasField(SvxPageField::StaticClassId()); - if( !bNotMasterCachable ) - { - bNotMasterCachable=rText.HasField(SvxHeaderField::StaticClassId()); - if( !bNotMasterCachable ) - { - bNotMasterCachable=rText.HasField(SvxFooterField::StaticClassId()); - if( !bNotMasterCachable ) - { - bNotMasterCachable=rText.HasField(SvxDateTimeField::StaticClassId()); - } - } - } + bNotMasterCachable = rText.HasField(SvxPageField::CLASS_ID) + || rText.HasField(SvxHeaderField::CLASS_ID) + || rText.HasField(SvxFooterField::CLASS_ID) + || rText.HasField(SvxDateTimeField::CLASS_ID); } } |