loplugin:constantfunction

Change-Id: I7cb5b0c2cf9ade557173ca596ea5d42d853ff448

6 files changed, 2 insertions, 36 deletions

diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 2fe1b25df5b1..6209f572855a 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -256,7 +256,6 @@ namespace framework
             void    implts_notifyListeners(short nEvent, const css::uno::Any& rInfoParam);
 
             DECL_LINK( OptionsChanged, void* );
-            DECL_STATIC_LINK( LayoutManager, SettingsChanged, void* );
 
             //  OPropertySetHelper
 
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index f01093fa02e8..ec5f69856b83 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -60,12 +60,9 @@ class AddonsToolBarManager : public ToolBarManager
     protected:
         DECL_LINK_TYPED(Click, ToolBox *, void);
         DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
-        DECL_LINK_TYPED(Command, CommandEvent const *, void);
         DECL_LINK_TYPED(Select, ToolBox *, void);
-        DECL_LINK_TYPED(Activate, ToolBox *, void);
-        DECL_LINK_TYPED(Deactivate, ToolBox *, void);
-        DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
-        DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
+        DECL_LINK_TYPED(StateChanged, StateChangedType const *, void );
+        DECL_LINK_TYPED(DataChanged, DataChangedEvent const *, void );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE;
 };
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 78fb5a03f0c6..9fc9803ad897 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -132,8 +132,6 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(DropdownClick, ToolBox *, void);
         DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
         DECL_LINK_TYPED(Select, ToolBox *, void);
-        DECL_LINK_TYPED(Activate, ToolBox *, void);
-        DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
         DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
         DECL_LINK( MiscOptionsChanged, void* );
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 9f0b811f6668..cd6932451f11 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -146,8 +146,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
         m_xToolbarManager = uno::Reference< ui::XUIConfigurationListener >( static_cast< OWeakObject* >( m_pToolbarManager ), uno::UNO_QUERY );
     }
 
-    Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) );
-
     m_aAsyncLayoutTimer.SetTimeout( 50 );
     m_aAsyncLayoutTimer.SetTimeoutHdl( LINK( this, LayoutManager, AsyncLayoutHdl ) );
 
@@ -161,7 +159,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
 
 LayoutManager::~LayoutManager()
 {
-    Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_aAsyncLayoutTimer.Stop();
     setDockingAreaAcceptor(NULL);
     delete m_pGlobalSettings;
@@ -2620,11 +2617,6 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
     return 0;
 }
 
-IMPL_STATIC_LINK_NOARG(LayoutManager, SettingsChanged)
-{
-    return 1;
-}
-
 //  XLayoutManagerEventBroadcaster
 
 void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
@@ -2819,7 +2811,6 @@ throw( RuntimeException, std::exception )
     if ( rEvent.Source == Reference< XInterface >( m_xFrame, UNO_QUERY ))
     {
         // Our frame gets disposed, release all our references that depends on a working frame reference.
-        Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
 
         setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() );
 
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index f89563055c2d..1e5fbf9f4d89 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -82,8 +82,6 @@ AddonsToolBarManager::AddonsToolBarManager( const Reference< XComponentContext >
 {
     m_pToolBar->SetMenuType( TOOLBOX_MENUTYPE_CLIPPEDITEMS );
     m_pToolBar->SetSelectHdl( LINK( this, AddonsToolBarManager, Select) );
-    m_pToolBar->SetActivateHdl( LINK( this, AddonsToolBarManager, Activate) );
-    m_pToolBar->SetDeactivateHdl( LINK( this, AddonsToolBarManager, Deactivate) );
     m_pToolBar->SetClickHdl( LINK( this, AddonsToolBarManager, Click ) );
     m_pToolBar->SetDoubleClickHdl( LINK( this, AddonsToolBarManager, DoubleClick ) );
     m_pToolBar->SetCommandHdl( LINK( this, AddonsToolBarManager, Command ) );
@@ -413,9 +411,6 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Command, CommandEvent const *, void)
-{}
-
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
 {
     if ( m_bDisposed )
@@ -433,12 +428,6 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
-{}
-
-IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void)
-{}
-
 IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( *pStateChangedType == StateChangedType::ControlBackground )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a0492af406c4..ee1fe47c8927 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -207,8 +207,6 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_xURLTransformer = URLTransformer::create( m_xContext );
 
     m_pToolBar->SetSelectHdl( LINK( this, ToolBarManager, Select) );
-    m_pToolBar->SetActivateHdl( LINK( this, ToolBarManager, Activate) );
-    m_pToolBar->SetDeactivateHdl( LINK( this, ToolBarManager, Deactivate) );
     m_pToolBar->SetClickHdl( LINK( this, ToolBarManager, Click ) );
     m_pToolBar->SetDropdownClickHdl( LINK( this, ToolBarManager, DropdownClick ) );
     m_pToolBar->SetDoubleClickHdl( LINK( this, ToolBarManager, DoubleClick ) );
@@ -2024,12 +2022,6 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
-{}
-
-IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void)
-{}
-
 IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( m_bDisposed )