loplugin:expandablemethods

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

6 files changed, 4 insertions, 20 deletions

diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b5fb3757c336..1a3a7b520501 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -274,7 +274,7 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem )
 |************************************************************************/
 void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly )
 {
-    GetOKButton().set_sensitive(!bRdOnly);
+    m_xOKBtn->set_sensitive(!bRdOnly);
 }
 
 /*************************************************************************
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 39864c3a3d3b..7f36bd8ddc85 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -258,11 +258,6 @@ void SvxHpLinkDlg::SetInputSet( const SfxItemSet* pInSet )
     }
 }
 
-void SvxHpLinkDlg::Start()
-{
-    Start_Impl();
-}
-
 bool SvxHpLinkDlg::QueryClose()
 {
     bool bRet = true;
@@ -277,7 +272,7 @@ bool SvxHpLinkDlg::QueryClose()
     return bRet;
 }
 
-void SvxHpLinkDlg::Start_Impl()
+void SvxHpLinkDlg::Start()
 {
     SwitchPage(msCurrentPageId);
     ActivatePageImpl();
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index b7f88ef013f5..702cf6396304 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -90,7 +90,6 @@ private:
     DECL_LINK( ChosePageHdl_Impl, const OString&, void );
 
     IconChoicePageData*     GetPageData ( const OString& rId );
-    void                    Start_Impl();
 
     void                    SwitchPage( const OString& rId );
 
@@ -123,8 +122,6 @@ public:
     const sal_uInt16*   GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
 
-    weld::Button&       GetOKButton() { return *m_xOKBtn; }
-
     void                Start();
     bool                QueryClose();
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 947d7e25e12c..b27d3a33a51f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -311,12 +311,6 @@ void SvxJavaOptionsPage::ClearJavaInfo()
 #endif
 }
 
-void SvxJavaOptionsPage::ClearJavaList()
-{
-    m_xJavaList->clear();
-}
-
-
 void SvxJavaOptionsPage::LoadJREs()
 {
 #if HAVE_FEATURE_JAVA
@@ -561,7 +555,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
 void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
 {
     ClearJavaInfo();
-    ClearJavaList();
+    m_xJavaList->clear();
 
     SvtMiscOptions aMiscOpt;
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index e5537f1e1ff7..ffefecce2d47 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -98,7 +98,6 @@ private:
     DECL_LINK(ExpertConfigHdl_Impl, weld::Button&, void);
 
     void                    ClearJavaInfo();
-    void                    ClearJavaList();
     void                    LoadJREs();
     void                    AddJRE( JavaInfo const * _pInfo );
     void                    HandleCheckEntry(int nCheckedRow);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 18bcfc734689..811fc0cfacb7 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -119,7 +119,6 @@ public:
 
     void            NotifyChange(const Color&  rColor);
     void            NotifyChange(const BitmapEx* pBitmap);
-    void            SetFillColor(const Color& rColor) { aColor = rColor; }
 
 protected:
     virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override;
@@ -164,7 +163,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
     if ( !bIsBmp )
     {
         const static Color aTranspCol(COL_TRANSPARENT);
-        SetFillColor(rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor());
+        aColor = rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor();
         Invalidate(aDrawRect);
     }
 }