loplugin:expandablemethods

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

9 files changed, 7 insertions, 17 deletions

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 2020cb99f614..9f9bf53d4e46 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1441,7 +1441,7 @@ SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 
 void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos)
 {
-    const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
+    const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : m_pModel.get();
 
     // insert the item
     SvTreeListEntry* pParentEntry = FindEntry( pParent );
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 6011ace3eb17..eb857b1a5e78 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -247,7 +247,6 @@ public:
             const css::uno::Reference< css::container::XIndexAccess > & xControllers,
             const css::uno::Reference< css::form::runtime::XFormController > & xCurrent
         );
-    const FmFilterModel* GetFilterModel() const {return m_pModel.get();}
 
 private:
 
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index d15ba27dd9f9..9d52001d9bde 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -76,8 +76,6 @@ public:
 
     // data access
     const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
-    bool isTextAnimationAllowed() const { return mbTextAnimationAllowed; }
-    bool isGraphicAnimationAllowed() const { return mbGraphicAnimationAllowed; }
 };
 
 AnimatedExtractingProcessor2D::AnimatedExtractingProcessor2D(
@@ -103,8 +101,8 @@ void AnimatedExtractingProcessor2D::processBasePrimitive2D(const drawinglayer::p
         {
             const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D& rSwitchPrimitive = static_cast< const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D& >(rCandidate);
 
-            if((rSwitchPrimitive.isTextAnimation() && isTextAnimationAllowed())
-                || (rSwitchPrimitive.isGraphicAnimation() && isGraphicAnimationAllowed()))
+            if((rSwitchPrimitive.isTextAnimation() && mbTextAnimationAllowed)
+                || (rSwitchPrimitive.isGraphicAnimation() && mbGraphicAnimationAllowed))
             {
                 const drawinglayer::primitive2d::Primitive2DReference xReference(const_cast< drawinglayer::primitive2d::BasePrimitive2D* >(&rCandidate));
                 maPrimitive2DSequence.push_back(xReference);
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index e4a75085bce8..3084b4527686 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -81,7 +81,7 @@ void TextCharacterSpacingControl::dispose()
     {
         SvtViewOptions aWinOpt(EViewType::Window, SIDEBAR_SPACING_GLOBAL_VALUE);
         css::uno::Sequence<css::beans::NamedValue> aSeq
-            { { "Spacing", css::uno::makeAny(OUString::number(GetLastCustomValue())) } };
+            { { "Spacing", css::uno::makeAny(OUString::number(mnCustomKern)) } };
         aWinOpt.SetUserData(aSeq);
     }
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index d246cae073b1..6c3a649edf12 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -38,8 +38,6 @@ public:
     virtual ~TextCharacterSpacingControl() override;
     virtual void dispose() override;
 
-    long  GetLastCustomValue() const { return mnCustomKern;}
-
 private:
     VclPtr<MetricField> maEditKerning;
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2deae4c913cb..d5ed29862e3d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -435,7 +435,6 @@ public:
     // data read access
     const sdr::overlay::OverlaySelection* getOverlaySelection() const { return mpOverlaySelection; }
     const OutlinerView& getOutlinerView() const { return mrOutlinerView; }
-    bool getVisualizeSurroundingFrame() const { return mbVisualizeSurroundingFrame; }
 
     /// override to check conditions for last createOverlayObjectPrimitive2DSequence
     virtual drawinglayer::primitive2d::Primitive2DContainer
@@ -453,7 +452,7 @@ TextEditOverlayObject::createOverlayObjectPrimitive2DSequence()
     drawinglayer::primitive2d::Primitive2DContainer aRetval;
 
     /// outer frame visualization
-    if (getVisualizeSurroundingFrame())
+    if (mbVisualizeSurroundingFrame)
     {
         const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
         const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 7e14a6d3bdd9..135b934be8b4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -88,8 +88,6 @@ public:
         const OUString& rMimeType, const css::uno::Any & rValue ) override;
 
     void                Connect() { GetRealObject(); }
-
-    const OUString& getReferer() const { return rGrafObj.aReferer; }
 };
 
 SdrGraphicLink::SdrGraphicLink(SdrGrafObj& rObj)
@@ -110,7 +108,7 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj& rObj)
         sfx2::LinkManager::GetDisplayNames( this, nullptr, &rGrafObj.aFileName, nullptr, &rGrafObj.aFilterName );
 
         Graphic aGraphic;
-        if (sfx2::LinkManager::GetGraphicFromAny(rMimeType, rValue, getReferer(), aGraphic, nullptr))
+        if (sfx2::LinkManager::GetGraphicFromAny(rMimeType, rValue, rGrafObj.aReferer, aGraphic, nullptr))
         {
             rGrafObj.ImpSetLinkedGraphic(aGraphic);
         }
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index abf7c55f85ba..ea7fd2e3306f 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -290,7 +290,6 @@ void TableBorderHdl::CreateB2dIAObject()
                     // this handle is also used when text edit *is* active for it. This
                     // interferes too much concerning repaint stuff (at least as long as
                     // text edit is not yet on the overlay)
-                    const bool bAnimate = getAnimate();
 
                     OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
                     float fScaleFactor = rOutDev.GetDPIScaleFactor();
@@ -299,7 +298,7 @@ void TableBorderHdl::CreateB2dIAObject()
                     std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject(
                         new sdr::overlay::OverlayRectangle(aRange.getMinimum(), aRange.getMaximum(),
                                                            aHilightColor, fTransparence,
-                                                           fWidth, 0.0, 0.0, bAnimate));
+                                                           fWidth, 0.0, 0.0, mbAnimate));
 
                     // OVERLAYMANAGER
                     insertNewlyCreatedOverlayObjectForSdrHdl(
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index c436fed56abd..1e651bc47533 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -74,7 +74,6 @@ public:
         bool bAnimate);
 
     virtual PointerStyle GetPointer() const override;
-    bool getAnimate() const { return mbAnimate; }
 
 protected:
     // create marker for this kind