diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 15:41:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 15:41:52 +0200 |
| commit | 7314fc7b9436ac44dbf0e5fece8c156a19ef3861 (patch) | |
| tree | 898f61aa4374b3936f67e3c886d04ad65350cb36 /sfx2 | |
| parent | e1c6c850b7c478a672dc914e60e87bc0ce4506fc (diff) | |
loplugin:staticmethods
Change-Id: I9b661dc67ccbdcb757d661168b4c3fa4b6f5b1fa
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 48b5064e395b..c71c9c0ea7ea 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -69,7 +69,7 @@ protected: SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false ); void CreateFromSVMenu(); - DECL_LINK_TYPED( Highlight, Menu *, bool ); + DECL_STATIC_LINK_TYPED( SfxVirtualMenu, Highlight, Menu *, bool ); DECL_LINK_TYPED( Activate, Menu *, bool ); DECL_LINK_TYPED( Deactivate, Menu *, bool ); DECL_LINK( SettingsChanged, void* ); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 93e729ee1926..11615859234b 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -483,7 +483,8 @@ void SfxVirtualMenu::CreateFromSVMenu() // called on activation of the SV-Menu -IMPL_LINK_NOARG_TYPED( SfxVirtualMenu, Highlight, Menu *, bool ) +IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( + SfxVirtualMenu, Highlight, Menu *, bool ) { return true; diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index ce0c7bdeb15d..18c3b2937908 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -273,10 +273,12 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_LINK_NOARG_TYPED(SidebarToolBox, ActivateToolBox, ToolBox*, void) +IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( + SidebarToolBox, ActivateToolBox, ToolBox*, void) {} -IMPL_LINK_NOARG_TYPED(SidebarToolBox, DeactivateToolBox, ToolBox*, void) +IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( + SidebarToolBox, DeactivateToolBox, ToolBox*, void) {} } } // end of namespace sfx2::sidebar |