loplugin:expandablemethods in forms..formula

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

4 files changed, 4 insertions, 33 deletions

diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 91f6a8a82f1c..c12b0e289118 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -165,28 +165,14 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarControl::getImplementationName()  throw( RuntimeException, std::exception )
     {
-        return getImplementationName_Static();
-    }
-
-
-    Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames()  throw( RuntimeException, std::exception )
-    {
-        return getSupportedServiceNames_Static();
-    }
-
-
-    OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
-    {
         return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
     }
 
 
-    Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
+    Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames()  throw( RuntimeException, std::exception )
     {
-        Sequence< OUString > aServices( 2 );
-        aServices[ 0 ] = "com.sun.star.awt.UnoControl";
-        aServices[ 1 ] = "com.sun.star.form.control.NavigationToolBar";
-        return aServices;
+        return { "com.sun.star.awt.UnoControl",
+        "com.sun.star.form.control.NavigationToolBar" };
     }
 
 
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 3fa62b30ac7c..8f73cbe53a93 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -51,12 +51,6 @@ namespace frm
     protected:
         virtual ~ONavigationBarControl() override;
 
-    public:
-        // XServiceInfo - static version
-        static  OUString SAL_CALL getImplementationName_Static();
-        static  css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
-
-    protected:
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl )
         virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index f0f6f0a80829..ae15046a045d 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -171,12 +171,7 @@ namespace frm
         if ( pPositionWindow )
             pPositionWindow->setDispatcher( _pDispatcher );
 
-        updateFeatureStates( );
-    }
-
-
-    void NavigationToolBar::updateFeatureStates( )
-    {
+        // update feature states
         for ( sal_uInt16 nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos )
         {
             sal_uInt16 nItemId = m_pToolbar->GetItemId( nPos );
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index b195f7ba9b55..5adae53dae9b 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -132,10 +132,6 @@ namespace frm
         /// enables or disables an item, plus possible dependent items
         void implEnableItem( sal_uInt16 _nItemId, bool _bEnabled );
 
-        /** update the states of all features, using the callback
-        */
-        void updateFeatureStates( );
-
         // iterating through item windows
         typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, vcl::Window*) const;
         void    forEachItemWindow( ItemWindowHandler _handler );