loplugin:expandablemethods

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

11 files changed, 22 insertions, 49 deletions

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 1f819f0974d1..bf7d4e1096ee 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -186,11 +186,6 @@ void SvxLanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTy
     }
 }
 
-void SvxLanguageBox::ImplClear()
-{
-    m_xControl->clear();
-}
-
 void SvxLanguageBox::SetLanguageList( SvxLanguageListFlags nLangList,
         bool bHasLangNone, bool bLangNoneIsLangAll, bool bCheckSpellAvail )
 {
@@ -200,7 +195,7 @@ void SvxLanguageBox::SetLanguageList( SvxLanguageListFlags nLangList,
 
     if (SvxLanguageListFlags::EMPTY == nLangList)
     {
-        ImplClear();
+        m_xControl->clear();
         return;
     }
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index fb01b66e9524..379649a65f6e 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -605,15 +605,9 @@ bool FmSearchEngine::GetCaseSensitive() const
 }
 
 
-void FmSearchEngine::clearControlTexts()
-{
-    m_aControlTexts.clear();
-}
-
-
 void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 {
-    clearControlTexts();
+    m_aControlTexts.clear();
     Reference< XInterface >  xCurrent;
     for (const auto & rField : arrFields)
     {
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index fa3ab3ea9167..ee91ac4ee9bd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1304,7 +1304,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     const long      nReservePos = rOStm.Tell();
     std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 ));
 
-    rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up
+    rOStm.WriteUInt32( GetId() ).WriteBool( pThm->IsNameFromResource() ); // From version 2 and up
 
     pCompat.reset();
 
@@ -1466,7 +1466,6 @@ const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL();
 const INetURLObject& GalleryTheme::GetStrURL() const { return pThm->GetStrURL(); }
 sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
 void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
-bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
 bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
 bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
 
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index e40ffe2f2a7d..e358b1b01216 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -34,10 +34,10 @@ namespace sdr
             {
                 const drawinglayer::primitive2d::Primitive2DReference aPrimitive(
                     new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                        getBitmapEx1(),
+                        maBitmapEx1,
                         getBasePosition(),
-                        getCenterX1(),
-                        getCenterY1(),
+                        mnCenterX1,
+                        mnCenterY1,
                         getShearX(),
                         getRotation()));
 
@@ -47,10 +47,10 @@ namespace sdr
             {
                 const drawinglayer::primitive2d::Primitive2DReference aPrimitive(
                     new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                        getBitmapEx2(),
+                        maBitmapEx2,
                         getBasePosition(),
-                        getCenterX2(),
-                        getCenterY2(),
+                        mnCenterX2,
+                        mnCenterY2,
                         getShearX(),
                         getRotation()));
 
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 0d7995b1c3a6..647522204a03 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -32,12 +32,12 @@ namespace sdr
         {
             drawinglayer::primitive2d::Primitive2DReference aReference(
                 new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                    getBitmapEx(),
+                    maBitmapEx,
                     getBasePosition(),
-                    getCenterX(),
-                    getCenterY(),
-                    getShearX(),
-                    getRotation()));
+                    mnCenterX,
+                    mnCenterY,
+                    mfShearX,
+                    mfRotation));
 
             if(basegfx::fTools::more(mfAlpha, 0.0))
             {
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index 3cd98e349af7..0938b50aa184 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -37,8 +37,8 @@ namespace sdr
             basegfx::B2DPolygon aPolygon;
 
             aPolygon.append(getBasePosition());
-            aPolygon.append(getSecondPosition());
-            aPolygon.append(getThirdPosition());
+            aPolygon.append(maSecondPosition);
+            aPolygon.append(maThirdPosition);
             aPolygon.setClosed(true);
 
             const drawinglayer::primitive2d::Primitive2DReference aReference(
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index f4b959ce435d..6f396c7540ed 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -233,7 +233,7 @@ void SdrPaintWindow::impCreateOverlayManager()
 {
     // not yet one created?
     if(!mxOverlayManager.is())
-        mxOverlayManager = GetPaintView().CreateOverlayManager(GetOutputDevice());
+        mxOverlayManager = mrPaintView.CreateOverlayManager(GetOutputDevice());
 }
 
 SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, vcl::Window* pWindow)
@@ -280,7 +280,7 @@ void SdrPaintWindow::PreparePreRenderDevice()
     const bool bPrepareBufferedOutput(
         mrPaintView.IsBufferedOutputAllowed()
         && !OutputToPrinter()
-        && !OutputIsVirtualDevice()
+        && !mpOutputDevice->IsVirtual()
         && !OutputToRecordingMetaFile());
 
     if(bPrepareBufferedOutput)
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 2f9d53028988..01235398a9d2 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -277,14 +277,9 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO
 }
 
 
-void SdrGluePointList::Clear()
-{
-    aList.clear();
-}
-
 SdrGluePointList& SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 {
-    if (GetCount()!=0) Clear();
+    if (GetCount()!=0) aList.clear();
     sal_uInt16 nCount=rSrcList.GetCount();
     for (sal_uInt16 i=0; i<nCount; i++) {
         Insert(rSrcList[i]);
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index d27221fb4014..dee11e58c95d 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -74,14 +74,9 @@ tools::Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
     return aRet;
 }
 
-void SdrHelpLineList::Clear()
-{
-    aList.clear();
-}
-
 SdrHelpLineList& SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
 {
-    Clear();
+    aList.clear();
     sal_uInt16 nCount=rSrcList.GetCount();
     for (sal_uInt16 i=0; i<nCount; i++) {
         Insert(rSrcList[i]);
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 950660669bad..2daa1961b598 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -95,11 +95,6 @@ SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const
     return maPageWindows[nIndex].get();
 }
 
-void SdrPageView::ClearPageWindows()
-{
-    maPageWindows.clear();
-}
-
 SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
 :   mrView(rNewView),
     // col_auto color lets the view takes the default SvxColorConfig entry
@@ -197,7 +192,7 @@ void SdrPageView::Hide()
             InvalidateAllWin();
         }
         mbVisible = false;
-        ClearPageWindows();
+        maPageWindows.clear();
     }
 }
 
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index effc9fce5fd5..fef60dc90f34 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -60,7 +60,7 @@ bool SvxPresetListBox::Command(const CommandEvent& rEvent)
 
 void SvxPresetListBox::DrawLayout()
 {
-    SetColCount(getColumnCount());
+    SetColCount(nColCount);
     SetLineCount(5);
 }