loplugin:expandablemethodds in svx

Change-Id: I45447b6f5cf7e17d6e81e8c931b07b26d41b9a8c
Reviewed-on: https://gerrit.libreoffice.org/30057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

41 files changed, 54 insertions, 157 deletions

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2f316de609d3..3f62c8dcc26b 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -580,7 +580,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void)
 
         SetGraphic( aUpdateGraphic );
         SetPolyPolygon( aUpdatePolyPoly );
-        SetEditingObject( pUpdateEditingObject );
+        pCheckObj = pUpdateEditingObject;
         bGraphicLinked = bUpdateGraphicLinked;
 
         aUpdateGraphic = Graphic();
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 75c53ece5c0a..c6eae9adae5e 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -110,7 +110,6 @@ public:
     void                SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
     tools::PolyPolygon  GetPolyPolygon();
 
-    void                SetEditingObject( void* pObj ) { pCheckObj = pObj; }
     const void*         GetEditingObject() const { return pCheckObj; }
 
     bool                IsUndoPossible() const;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 7d85606ca724..86bf1a92ef7c 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1073,7 +1073,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop
 
     pTPFilter->SetRedlinTable(GetViewTable());
 
-    ShowViewPage();
+    SetCurPageId(m_nViewPageId);
 
     Show();
 }
@@ -1096,11 +1096,6 @@ void SvxAcceptChgCtr::ShowFilterPage()
     SetCurPageId(m_nFilterPageId);
 }
 
-void SvxAcceptChgCtr::ShowViewPage()
-{
-    SetCurPageId(m_nViewPageId);
-}
-
 SvxRedlinTable* SvxAcceptChgCtr::GetViewTable()
 {
     return pTPView ? pTPView->GetTableControl() : nullptr;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index fb09fe6d8cf4..ebc66b0f7072 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -278,11 +278,6 @@ void SvxIMapDlg::SetExecState( bool bEnable )
     pOwnData->bExecState = bEnable;
 }
 
-void SvxIMapDlg::SetGraphic( const Graphic& rGraphic )
-{
-    pIMapWnd->SetGraphic( rGraphic );
-}
-
 void SvxIMapDlg::SetImageMap( const ImageMap& rImageMap )
 {
     pIMapWnd->SetImageMap( rImageMap );
@@ -737,10 +732,10 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void)
             DoSave();
         }
 
-        SetGraphic( pOwnData->aUpdateGraphic );
+        pIMapWnd->SetGraphic( pOwnData->aUpdateGraphic );
         SetImageMap( pOwnData->aUpdateImageMap );
         SetTargetList( pOwnData->aUpdateTargetList );
-        SetEditingObject( pOwnData->pUpdateEditingObject );
+        pCheckObj = pOwnData->pUpdateEditingObject;
 
         // After changes => default selection
         m_pTbxIMapDlg1->CheckItem( mnSelectId );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 755403338a2f..cbc6f2b347e7 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -185,7 +185,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface
 
 FmEntryData::~FmEntryData()
 {
-    Clear();
+    GetChildList()->clear();
     delete pChildList;
 }
 
@@ -221,11 +221,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 }
 
 
-void FmEntryData::Clear()
-{
-    GetChildList()->clear();
-}
-
 
 bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index aed2077ddac6..7e50a3d1a858 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -29,7 +29,7 @@
 bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-    return( xInterface == static_cast<const FmInterfaceItem&>(rAttr).GetInterface() );
+    return xInterface == static_cast<const FmInterfaceItem&>(rAttr).xInterface;
 }
 
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1ad1630136b8..c1e0b16c0996 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3650,10 +3650,10 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction /
 
     UpdateForms( true );
 
-    if ( !hasEverBeenActivated() )
+    if ( m_bFirstActivation )
     {
         m_nActivationEvent = Application::PostUserEvent( LINK( this, FmXFormShell, OnFirstTimeActivation ) );
-        setHasBeenActivated();
+        m_bFirstActivation = false;
     }
 
     // find a default "current form", if there is none, yet
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 57f6f54a35bf..64d1c8f15ce9 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -190,7 +190,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
 
 void GalleryTheme::ImplWrite()
 {
-    if( IsModified() )
+    if( pThm->IsModified() )
     {
         INetURLObject aPathURL( GetThmURL() );
 
@@ -1286,7 +1286,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     bool                bRel;
 
     rOStm.WriteUInt16( 0x0004 );
-    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, pThm->GetThemeName(), RTL_TEXTENCODING_UTF8);
     rOStm.WriteUInt32( nCount ).WriteUInt16( osl_getThreadTextEncoding() );
 
     for( sal_uInt32 i = 0; i < nCount; i++ )
@@ -1514,7 +1514,6 @@ void GalleryTheme::ImplSetModified( bool bModified )
     pThm->SetModified(bModified);
 }
 
-const OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
 const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
 const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
 const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
@@ -1523,7 +1522,6 @@ void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) { pThm->SetI
 bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
 bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
 bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
-bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
 
 const tools::SvRef<SotStorage>& GalleryTheme::GetSvDrawStorage() const
 {
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 29cfa3aa2be7..d62995ff462d 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -157,7 +157,6 @@ public:
     FmEntryData( const FmEntryData& rEntryData );
     virtual ~FmEntryData();
 
-    void    Clear();
     void    SetText( const OUString& rText ){ aText = rText; }
     void    SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
 
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index c04445f81115..c017605d7fb5 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -43,8 +43,6 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const override;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const override;
-
-    const css::uno::Reference< css::uno::XInterface >&  GetInterface() const { return xInterface; }
 };
 
 inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 300650ec6ed4..48c518b3984b 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -319,10 +319,6 @@ public:
     SAL_DLLPRIVATE void        SetY2KState(sal_uInt16 n);
 
 protected:
-    // activation handling
-    SAL_DLLPRIVATE inline  bool    hasEverBeenActivated( ) const { return !m_bFirstActivation; }
-    SAL_DLLPRIVATE inline  void        setHasBeenActivated( ) { m_bFirstActivation = false; }
-
     // form handling
     /// load or unload the forms on a page
     SAL_DLLPRIVATE         void        loadForms( FmFormPage* _pPage, const LoadFormsFlags _nBehaviour );
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index dd04f24dca75..1615e64ef227 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -290,7 +290,7 @@ SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVer
 
 SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    return new SdrCustomShapeGeometryItem( GetGeometry() );
+    return new SdrCustomShapeGeometryItem( aPropSeq );
 }
 
 sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index f98f1d754fc3..f908782b015c 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -100,7 +100,7 @@ namespace drawinglayer
                 return true;
             }
 
-            if(hasFillGradientAttribute() && !maFillGradientAttribute->isDefault())
+            if(maFillGradientAttribute.get() && !maFillGradientAttribute->isDefault())
             {
                 return true;
             }
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 5325ca00fac5..ebce0221edfe 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -228,7 +228,6 @@ namespace drawinglayer
             sal_Int32 getFormTextStart() const { return mnFormTextStart; }
             sal_Int32 getFormTextShdwXVal() const { return mnFormTextShdwXVal; }
             sal_Int32 getFormTextShdwYVal() const { return mnFormTextShdwYVal; }
-            sal_uInt16 getFormTextShdwTransp() const { return mnFormTextShdwTransp; }
             XFormTextStyle getFormTextStyle() const { return meFormTextStyle; }
             XFormTextAdjust getFormTextAdjust() const { return meFormTextAdjust; }
             XFormTextShadow getFormTextShadow() const { return meFormTextShadow; }
@@ -245,7 +244,7 @@ namespace drawinglayer
                     && getFormTextStart() == rCandidate.getFormTextStart()
                     && getFormTextShdwXVal() == rCandidate.getFormTextShdwXVal()
                     && getFormTextShdwYVal() == rCandidate.getFormTextShdwYVal()
-                    && getFormTextShdwTransp() == rCandidate.getFormTextShdwTransp()
+                    && mnFormTextShdwTransp == rCandidate.mnFormTextShdwTransp
                     && getFormTextStyle() == rCandidate.getFormTextStyle()
                     && getFormTextAdjust() == rCandidate.getFormTextAdjust()
                     && getFormTextShadow() == rCandidate.getFormTextShadow()
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index b0d347f0c86e..d7460cbda6d2 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -171,14 +171,12 @@ namespace drawinglayer
             bool isScroll() const { return mbScroll; }
             bool isInEditMode() const { return mbInEditMode; }
             bool isFixedCellHeight() const { return mbFixedCellHeight; }
-            bool isWrongSpell() const { return mbWrongSpell; }
             bool isChainable() const { return mbChainable; }
             const SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; }
             sal_Int32 getTextLeftDistance() const { return maTextLeftDistance; }
             sal_Int32 getTextUpperDistance() const { return maTextUpperDistance; }
             sal_Int32 getTextRightDistance() const { return maTextRightDistance; }
             sal_Int32 getTextLowerDistance() const { return maTextLowerDistance; }
-            sal_uInt32 getPropertiesVersion() const { return maPropertiesVersion; }
             SdrTextHorzAdjust getSdrTextHorzAdjust() const { return maSdrTextHorzAdjust; }
             SdrTextVertAdjust getSdrTextVertAdjust() const { return maSdrTextVertAdjust; }
 
@@ -218,7 +216,7 @@ namespace drawinglayer
                     && getTextUpperDistance() == rCandidate.getTextUpperDistance()
                     && getTextRightDistance() == rCandidate.getTextRightDistance()
                     && getTextLowerDistance() == rCandidate.getTextLowerDistance()
-                    && getPropertiesVersion() == rCandidate.getPropertiesVersion()
+                    && maPropertiesVersion == rCandidate.maPropertiesVersion
 
                     && getSdrTextHorzAdjust() == rCandidate.getSdrTextHorzAdjust()
                     && getSdrTextVertAdjust() == rCandidate.getSdrTextVertAdjust()
@@ -231,7 +229,7 @@ namespace drawinglayer
                     && isScroll() == rCandidate.isScroll()
                     && isInEditMode() == rCandidate.isInEditMode()
                     && isFixedCellHeight() == rCandidate.isFixedCellHeight()
-                    && isWrongSpell() == rCandidate.isWrongSpell() );
+                    && mbWrongSpell == rCandidate.mbWrongSpell );
             }
         };
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 081284cf7d9e..6e6b0559fc7c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -597,7 +597,7 @@ namespace sdr { namespace contact {
         /** determines whether our control is currently visible
             @nofail
         */
-        bool    isControlVisible() const { return impl_isControlVisible_nofail(); }
+        bool    isControlVisible() const { return m_bControlIsVisible; }
 
         /// creates an XControl for the given device and SdrUnoObj
         static bool
@@ -749,16 +749,6 @@ namespace sdr { namespace contact {
         */
         bool    impl_isDisposed_nofail() const { return m_pAntiImpl == nullptr; }
 
-        /** determines whether our control is currently visible
-            @nofail
-        */
-        bool    impl_isControlVisible_nofail() const { return m_bControlIsVisible; }
-
-        /** determines whether we are currently a listener at the control for design-mode relevant facets
-            @nofail
-        */
-        bool    impl_isDesignModeListening_nofail() const { return m_bIsDesignModeListening; }
-
         /** determines whether the control currently is in design mode
 
             @precond
@@ -1181,7 +1171,7 @@ namespace sdr { namespace contact {
             return;
 
         SdrPageViewAccess aPVAccess( *pPageView );
-        impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), false/*_bForce*/ );
+        impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, m_bControlIsVisible, false/*_bForce*/ );
     }
 
 
@@ -1259,7 +1249,7 @@ namespace sdr { namespace contact {
 
     void ViewObjectContactOfUnoControl_Impl::impl_switchDesignModeListening_nothrow( bool _bStart )
     {
-        if ( impl_isDesignModeListening_nofail() != _bStart )
+        if ( m_bIsDesignModeListening != _bStart )
         {
             m_bIsDesignModeListening = _bStart;
             impl_switchPropertyListening_nothrow( _bStart );
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 864274093103..d0f1d192b20b 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -238,7 +238,7 @@ namespace sdr
                     }
                 }
 
-                if(DoRefreshWithPreRendering())
+                if(mbRefreshWithPreRendering)
                 {
                     // #i73602# ensure valid and sized mpOutputBufferDevice
                     const Size aDestinationSizePixel(mpBufferDevice->GetOutputSizePixel());
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index f8e44ceb7978..5ca6da5b8628 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -29,7 +29,7 @@ namespace sdr
     {
         drawinglayer::primitive2d::Primitive2DContainer OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence()
         {
-            return getSequence();
+            return maSequence;
         }
 
         OverlayPrimitive2DSequenceObject::OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence)
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 016343405f53..7c72884205c0 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -54,10 +54,10 @@ namespace sdr
                 new drawinglayer::primitive2d::OverlayRectanglePrimitive(
                     aHatchRange,
                     aColor,
-                    getTransparence(),
-                    getDiscreteGrow(),
-                    getDiscreteShrink(),
-                    getRotation()));
+                    mfTransparence,
+                    mfDiscreteGrow,
+                    mfDiscreteShrink,
+                    mfRotation));
 
             return drawinglayer::primitive2d::Primitive2DContainer { aReference };
         }
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index 8439c29d8128..1f75c8fa9094 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -35,14 +35,14 @@ namespace sdr
         {
             drawinglayer::primitive2d::Primitive2DContainer aRetval;
 
-            if(getOverlayManager() && (getShowBounds() || getExtendedLines()))
+            if(getOverlayManager() && (mbShowBounds || mbExtendedLines))
             {
                 const basegfx::BColor aRGBColorA(getOverlayManager()->getStripeColorA().getBColor());
                 const basegfx::BColor aRGBColorB(getOverlayManager()->getStripeColorB().getBColor());
                 const double fStripeLengthPixel(getOverlayManager()->getStripeLengthPixel());
                 const basegfx::B2DRange aRollingRectangle(getBasePosition(), getSecondPosition());
 
-                if(getShowBounds())
+                if(mbShowBounds)
                 {
                     // view-independent part, create directly
                     const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRollingRectangle));
@@ -66,7 +66,7 @@ namespace sdr
                         false);
                 }
 
-                if(getExtendedLines())
+                if(mbExtendedLines)
                 {
                     // view-dependent part, use helper primitive
                     const drawinglayer::primitive2d::Primitive2DReference aReference(
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 4c253185b8a4..0eb66b097578 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -135,7 +135,7 @@ namespace sdr
                             aRetval,
                             fTransparence));
 
-                    if(getBorder())
+                    if(mbBorder)
                     {
                         const basegfx::B2DPolyPolygon aPolyPolygon(impCombineRangesToPolyPolygon(getRanges()));
                         const drawinglayer::primitive2d::Primitive2DReference aSelectionOutline(
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index a4fa9e4f3419..83ced58e54a8 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -160,7 +160,7 @@ namespace drawinglayer
 
                     // #i104867# to find out if the Graphic content of the
                     // OLE has changed, use GraphicVersion number
-                    && getGraphicVersion() == rCompare.getGraphicVersion()
+                    && mnGraphicVersion == rCompare.mnGraphicVersion
                 );
             }
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 46e37e6f17dc..eb13510ad924 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -74,7 +74,7 @@ TextCharacterSpacingControl::~TextCharacterSpacingControl()
 
 void TextCharacterSpacingControl::dispose()
 {
-    if (GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
+    if (mnLastCus == SPACING_CLOSE_BY_CUS_EDIT)
     {
         SvtViewOptions aWinOpt(E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE);
         css::uno::Sequence<css::beans::NamedValue> aSeq
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index 7d30ab9704d0..9035c71290ad 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -38,7 +38,6 @@ public:
     virtual ~TextCharacterSpacingControl() override;
     virtual void dispose() override;
 
-    short GetLastCustomState() { return mnLastCus;}
     long  GetLastCustomValue() { return mnCustomKern;}
 
 private:
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 5c235813ced1..9d119f3eccf9 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -828,7 +828,7 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
 
 void SdrDragMethod::destroyOverlayGeometry()
 {
-    clearOverlayObjectList();
+    maOverlayObjectList.clear();
 }
 
 bool SdrDragMethod::DoAddConnectorOverlays()
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b4469e7e4796..11311277f884 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects()
                 }
 
                 // UNDO-Comment and end of UNDO
-                SetUndoComment(ImpGetResStr(STR_DistributeMarkedObjects));
+                mpModel->SetUndoComment(ImpGetResStr(STR_DistributeMarkedObjects));
 
                 if( bUndo )
                     EndUndo();
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 3e7b9478da1a..eb90259d7ab1 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1088,11 +1088,6 @@ Color SdrHdlColor::GetLuminance(const Color& rCol)
     return aRetval;
 }
 
-void SdrHdlColor::CallColorChangeLink()
-{
-    aColorChangeHdl.Call(this);
-}
-
 void SdrHdlColor::SetColor(Color aNew, bool bCallLink)
 {
     if(IsUseLuminance())
@@ -1108,7 +1103,7 @@ void SdrHdlColor::SetColor(Color aNew, bool bCallLink)
 
         // tell about change
         if(bCallLink)
-            CallColorChangeLink();
+            aColorChangeHdl.Call(this);
     }
 }
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index bc32fe67bcea..78f1d043f6b1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -433,7 +433,7 @@ bool SdrMarkView::EndMarkPoints()
         {
             Rectangle aRect(maDragStat.GetStart(), maDragStat.GetNow());
             aRect.Justify();
-            MarkPoints(aRect, mpMarkPointsOverlay->IsUnmarking());
+            MarkPoints(&aRect, mpMarkPointsOverlay->IsUnmarking());
 
             bRetval = true;
         }
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f440b121d537..39dd1b3db3f2 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -394,11 +394,6 @@ void SdrObject::Free( SdrObject*& _rpObject )
     delete pObject;
 }
 
-SdrObjPlusData* SdrObject::NewPlusData()
-{
-    return new SdrObjPlusData;
-}
-
 void SdrObject::SetRectsDirty(bool bNotMyself)
 {
     if (!bNotMyself) {
@@ -1035,7 +1030,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) co
 void SdrObject::ImpForcePlusData()
 {
     if (!pPlusData)
-        pPlusData = NewPlusData();
+        pPlusData = new SdrObjPlusData;
 }
 
 OUString SdrObject::GetAngleStr(long nAngle) const
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 0a032ed56f6e..65822737b2f6 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -525,18 +525,13 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPo
     rPoly=aPol;
 }
 
-void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
-{
-    ImpCalcTail3(rPara,rPoly,rRect);
-}
-
 void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
 {
     switch (rPara.eType) {
         case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break;
         case SdrCaptionType::Type2: ImpCalcTail2(rPara,rPoly,rRect); break;
         case SdrCaptionType::Type3: ImpCalcTail3(rPara,rPoly,rRect); break;
-        case SdrCaptionType::Type4: ImpCalcTail4(rPara,rPoly,rRect); break;
+        case SdrCaptionType::Type4: ImpCalcTail3(rPara,rPoly,rRect); break;
     }
 }
 
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 7b5ce5678631..69c1dd27ec9c 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -548,7 +548,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
     }
 
     // #i110649#
-    if(IsBoundRectCalculationRunning())
+    if(mbBoundRectCalculationRunning)
     {
         // This object is involved into another ImpRecalcEdgeTrack() call
         // from another SdrEdgeObj. Do not calculate again to avoid loop.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 6fdb0993e0f4..4ca13f6cedb6 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -534,11 +534,6 @@ bool SdrGrafObj::IsSwappedOut() const
     return mbIsPreview || pGraphic->IsSwappedOut();
 }
 
-bool SdrGrafObj::IsCropped() const
-{
-    return aGrafInfo.IsCropped();
-}
-
 const MapMode& SdrGrafObj::GetGrafPrefMapMode() const
 {
     return pGraphic->GetPrefMapMode();
@@ -571,7 +566,7 @@ Size SdrGrafObj::getOriginalSize() const
 {
     Size aSize = GetGrafPrefSize();
 
-    if (IsCropped())
+    if (aGrafInfo.IsCropped())
     {
         long aCroppedTop = OutputDevice::LogicToLogic( aGrafInfo.GetTopCrop(), GetModel()->GetScaleUnit(), GetGrafPrefMapMode().GetMapUnit());
         long aCroppedBottom = OutputDevice::LogicToLogic( aGrafInfo.GetBottomCrop(), GetModel()->GetScaleUnit(), GetGrafPrefMapMode().GetMapUnit());
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2b7774006df9..d799110844c7 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -468,11 +468,6 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
     return bRet;
 }
 
-bool SdrTextObj::HasEditText() const
-{
-    return HasTextImpl( pEdtOutl );
-}
-
 void SdrTextObj::SetPage(SdrPage* pNewPage)
 {
     bool bRemove=pNewPage==nullptr && pPage!=nullptr;
@@ -2099,11 +2094,6 @@ SdrTextObj* SdrTextObj::GetPrevLinkInChain() const
     return mpPrevInChain;
 }
 
-void SdrTextObj::SetPreventChainable()
-{
-    mbIsUnchainableClone = true;
-}
-
 bool SdrTextObj::GetPreventChainable() const
 {
     // Prevent chaining it 1) during dragging && 2) when we are editing next link
@@ -2116,7 +2106,7 @@ bool SdrTextObj::GetPreventChainable() const
     SdrTextObj *pTextObjClone = dynamic_cast<SdrTextObj *>(pClone);
     if (pTextObjClone != nullptr) {
         // Avoid transferring of text for chainable object during dragging
-        pTextObjClone->SetPreventChainable();
+        pTextObjClone->mbIsUnchainableClone = true;
     }
 
     return pClone;
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index f4e39095895f..21ef7b94d9a4 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -419,7 +419,7 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
 bool SdrTextObj::HasText() const
 {
     if( pEdtOutl )
-        return HasEditText();
+        return HasTextImpl(pEdtOutl);
 
     OutlinerParaObject* pOPO = GetOutlinerParaObject();
 
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0fafd16de52c..c520ac7c9992 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -114,11 +114,6 @@ void SdrPageView::ClearPageWindows()
     maPageWindows.clear();
 }
 
-void SdrPageView::AppendPageWindow(SdrPageWindow& rNew)
-{
-    maPageWindows.push_back(&rNew);
-}
-
 SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld)
 {
     const SdrPageWindowVector::iterator aFindResult = ::std::find(maPageWindows.begin(), maPageWindows.end(), &rOld);
@@ -173,8 +168,7 @@ SdrPageView::~SdrPageView()
 
 void SdrPageView::CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow)
 {
-    SdrPageWindow& rWindow = *(new SdrPageWindow(*this, rPaintWindow));
-    AppendPageWindow(rWindow);
+    maPageWindows.push_back(new SdrPageWindow(*this, rPaintWindow));
 }
 
 void SdrPageView::AddPaintWindowToPageView(SdrPaintWindow& rPaintWindow)
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index b100976e4b81..c374c756e599 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -89,11 +89,6 @@ SdrPaintWindow* SdrPaintView::GetPaintWindow(sal_uInt32 nIndex) const
     return nullptr;
 }
 
-void SdrPaintView::AppendPaintWindow(SdrPaintWindow& rNew)
-{
-    maPaintWindows.push_back(&rNew);
-}
-
 void SdrPaintView::RemovePaintWindow(SdrPaintWindow& rOld)
 {
     const SdrPaintWindowVector::iterator aFindResult = ::std::find(maPaintWindows.begin(), maPaintWindows.end(), &rOld);
@@ -440,7 +435,7 @@ void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWin
 {
     DBG_ASSERT(pNewWin, "SdrPaintView::AddWindowToPaintView: No OutputDevice(!)");
     SdrPaintWindow* pNewPaintWindow = new SdrPaintWindow(*this, *pNewWin, pWindow);
-    AppendPaintWindow(*pNewPaintWindow);
+    maPaintWindows.push_back(pNewPaintWindow);
 
     if(mpPageView)
     {
@@ -1093,7 +1088,7 @@ bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
 
 SfxStyleSheet* SdrPaintView::GetStyleSheet() const
 {
-    return GetDefaultStyleSheet();
+    return mpDefaultStyleSheet;
 }
 
 bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
@@ -1246,12 +1241,7 @@ void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/)
 
 void SdrPaintView::onChangeColorConfig()
 {
-    SetGridColor( Color( maColorConfig.GetColorValue( svtools::DRAWGRID ).nColor ) );
-}
-
-void SdrPaintView::SetGridColor( Color aColor )
-{
-    maGridColor = aColor;
+    maGridColor = Color( maColorConfig.GetColorValue( svtools::DRAWGRID ).nColor );
 }
 
 
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 8a1644a44c6c..b61d2851c520 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -44,15 +44,10 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
     bSetMarkedSegmentsKindPossible=false;
 }
 
-void SdrPolyEditView::ImpClearVars()
-{
-    ImpResetPolyPossibilityFlags();
-}
-
 SdrPolyEditView::SdrPolyEditView(SdrModel* pModel1, OutputDevice* pOut):
     SdrEditView(pModel1,pOut)
 {
-    ImpClearVars();
+    ImpResetPolyPossibilityFlags();
 }
 
 SdrPolyEditView::~SdrPolyEditView()
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index c97192b19339..0b8ee3c2d720 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -224,10 +224,6 @@ namespace drawinglayer
             const SvxBorderLine& getBottomLine() const { return maBottomLine; }
             const SvxBorderLine& getRightLine() const { return maRightLine; }
             const SvxBorderLine& getTopLine() const { return maTopLine; }
-            bool getLeftIsOutside() const { return mbLeftIsOutside; }
-            bool getBottomIsOutside() const { return mbBottomIsOutside; }
-            bool getRightIsOutside() const { return mbRightIsOutside; }
-            bool getTopIsOutside() const { return mbTopIsOutside; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
@@ -325,7 +321,7 @@ namespace drawinglayer
                 }
             }
 
-            if(!getBottomLine().isEmpty() && getBottomIsOutside())
+            if(!getBottomLine().isEmpty() && mbBottomIsOutside)
             {
                 // create bottom line from left to right
                 const basegfx::B2DPoint aStart(getTransform() * basegfx::B2DPoint(0.0, 1.0));
@@ -446,10 +442,10 @@ namespace drawinglayer
                     && maTopFromRLine == rCompare.maTopFromRLine
                     && maBottomFromLLine == rCompare.maBottomFromLLine
                     && maBottomFromRLine == rCompare.maBottomFromRLine
-                    && getLeftIsOutside() == rCompare.getLeftIsOutside()
-                    && getBottomIsOutside() == rCompare.getBottomIsOutside()
-                    && getRightIsOutside() == rCompare.getRightIsOutside()
-                    && getTopIsOutside() == rCompare.getTopIsOutside());
+                    && mbLeftIsOutside == rCompare.mbLeftIsOutside
+                    && mbBottomIsOutside == rCompare.mbBottomIsOutside
+                    && mbRightIsOutside == rCompare.mbRightIsOutside
+                    && mbTopIsOutside == rCompare.mbTopIsOutside);
             }
 
             return false;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index e70f94b9e991..994eb2d99d9f 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1188,7 +1188,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
     }
     case OWN_ATTR_VALUE_POLYGONKIND:
     {
-        rValue <<= GetPolygonKind();
+        rValue <<= mePolygonKind;
         break;
     }
     default:
@@ -1306,7 +1306,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
     }
     case OWN_ATTR_VALUE_POLYGONKIND:
     {
-        rValue <<= GetPolygonKind();
+        rValue <<= mePolygonKind;
         break;
     }
     default:
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 6de5b89aef8d..d2849121475c 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -51,8 +51,6 @@ private:
 
     cppu::OBroadcastHelper mrBHelper;
 
-    void disposing() throw();
-
 public:
     SvxShapeCollection() throw();
     virtual ~SvxShapeCollection() throw() override;
@@ -127,12 +125,6 @@ void SvxShapeCollection::release() throw()
 }
 
 // XComponent
-void SvxShapeCollection::disposing() throw()
-{
-    maShapeContainer.clear();
-}
-
-// XComponent
 void SvxShapeCollection::dispose()
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -166,8 +158,7 @@ void SvxShapeCollection::dispose()
             // inform all listeners to release this object
             // The listener container are automatically cleared
             mrBHelper.aLC.disposeAndClear( aEvt );
-            // notify subclasses to do their dispose
-            disposing();
+            maShapeContainer.clear();
         }
         catch(const css::uno::Exception&)
         {
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d378a28038c5..5aeb6306b737 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -264,7 +264,7 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("isIndex"), BAD_CAST(OString::boolean(IsIndex()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(GetIndex()).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(nPalIndex).getStr()));
     xmlTextWriterEndElement(pWriter);
 }