From c2b48a763df113e63e6a27ee05b9a6834e4e49a4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 19 Oct 2016 15:06:27 +0200
Subject: 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>
---
 svtools/source/contnr/imivctl.hxx  | 2 --
 svtools/source/contnr/imivctl1.cxx | 4 ++--
 svtools/source/control/roadmap.cxx | 4 +---
 svtools/source/inc/unoiface.hxx    | 1 -
 svtools/source/misc/transfer.cxx   | 5 +----
 svtools/source/uno/unoiface.cxx    | 7 +------
 6 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'svtools/source')

diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 243428181aa6..4bac273fcddd 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -450,7 +450,6 @@ public:
                             SvxIconChoiceCtrlEntry* pEntry
                         );
 #endif
-    bool                IsEntryEditingEnabled() const { return bEntryEditingEnabled; }
     bool                IsEntryEditing() const { return (pCurEditedEntry!=nullptr); }
     void                EditEntry( SvxIconChoiceCtrlEntry* pEntry );
     void                StopEntryEditing();
@@ -480,7 +479,6 @@ public:
     const SvxIconChoiceCtrlColumnInfo* GetColumn( sal_uInt16 nIndex ) const;
 
     Rectangle           GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); }
-    Rectangle           GetVisibleRect() const { return GetOutputRect(); }
 
     void                SetEntryHighlightFrame(
                             SvxIconChoiceCtrlEntry* pEntry,
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 62d7d7f03714..82b8af5d4368 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -790,7 +790,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
         }
     }
     bool bSelected = pEntry->IsSelected();
-    bool bEditingEnabled = IsEntryEditingEnabled();
+    bool bEditingEnabled = bEntryEditingEnabled;
 
     if( rMEvt.GetClicks() == 2 )
     {
@@ -2034,7 +2034,7 @@ void SvxIconChoiceCtrl_Impl::ImpHideDDIcon()
 bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
 {
     Rectangle aDocRect( GetDocumentRect() );
-    Rectangle aVisRect( GetVisibleRect() );
+    Rectangle aVisRect( GetOutputRect() );
     if( aVisRect.IsInside( aDocRect ))
         return false;
     Size aDocSize( aDocRect.GetSize() );
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index cd9b9a0e9a12..db44584ab150 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -75,8 +75,6 @@ public:
 
     bool                    Contains( const vcl::Window* _pWindow ) const;
 
-    HyperLabel*             GetDescriptionHyperLabel() const { return mpDescription; }
-
 private:
     void                    ImplUpdateIndex( const ItemIndex _nIndex );
     void                    ImplUpdatePosSize();
@@ -748,7 +746,7 @@ void RoadmapItem::SetPosition(RoadmapItem* _pOldItem)
     }
     else
     {
-        Size aOldSize = _pOldItem->GetDescriptionHyperLabel()->GetSizePixel();
+        Size aOldSize = _pOldItem->mpDescription->GetSizePixel();
 
         aIDPos = _pOldItem->mpID->GetPosPixel();
         aIDPos.Y() += aOldSize.Height();
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index d99f46efdb39..adb0485f8c3a 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -184,7 +184,6 @@ public:
     css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
 
 protected:
-    css::uno::Reference< css::util::XNumberFormatsSupplier >  getFormatsSupplier() const;
     void    setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier);
     sal_Int32   getFormatKey() const;
     void    setFormatKey(sal_Int32 nKey);
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index c271ecb78bf5..d6731047d382 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1054,10 +1054,7 @@ public:
     TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );
 
     /// determines whether we're currently listening
-    inline bool isListening() const { return !isDisposed(); }
-
-    /// determines whether the instance is disposed
-    inline bool isDisposed() const { return mpListener == nullptr; }
+    inline bool isListening() const { return mpListener != nullptr; }
 
     /// makes the instance non-functional
     void    dispose();
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index d250fa12e235..f1df7df38195 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1000,7 +1000,7 @@ css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) th
             {
                 if (!bIsStandardSupplier)
                 {   // ansonsten void
-                    css::uno::Reference< css::util::XNumberFormatsSupplier >  xSupplier = getFormatsSupplier();
+                    css::uno::Reference< css::util::XNumberFormatsSupplier >  xSupplier = m_xCurrentSupplier.get();
                     aReturn <<= xSupplier;
                 }
             }
@@ -1020,11 +1020,6 @@ css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) th
     return aReturn;
 }
 
-css::uno::Reference< css::util::XNumberFormatsSupplier >  SVTXFormattedField::getFormatsSupplier() const
-{
-    return m_xCurrentSupplier.get();
-}
-
 css::uno::Any SVTXFormattedField::convertEffectiveValue(const css::uno::Any& rValue)
 {
     css::uno::Any aReturn;
-- 
cgit