diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 07:49:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 07:50:14 +0200 |
| commit | fc4726a1f41ded40ce7d7100350c322863646b37 (patch) | |
| tree | d0505d763b406081439b77b2e2630c4dd76bb656 /framework/inc | |
| parent | 0c415f61e4d2fb4efc50fe0401376657af47d203 (diff) | |
Use typed Menu::Set[De]actuivateHdl Links
Change-Id: I6736383ad0ec5c9f2ea2281bfdcfa280cd712032
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/classes/menumanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 92dc2d6028cd..4c471a29f398 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -76,8 +76,8 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener protected: DECL_LINK_TYPED(Highlight, Menu *, bool); - DECL_LINK( Activate, Menu * ); - DECL_LINK( Deactivate, Menu * ); + DECL_LINK_TYPED( Activate, Menu *, bool ); + DECL_LINK_TYPED( Deactivate, Menu *, bool ); private: void UpdateSpecialFileMenu( Menu* pMenu ); diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 23cd41d5a54a..b72d515be311 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -152,8 +152,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener protected: DECL_LINK_TYPED(Highlight, Menu *, bool); - DECL_LINK( Activate, Menu * ); - DECL_LINK( Deactivate, Menu * ); + DECL_LINK_TYPED( Activate, Menu *, bool ); + DECL_LINK_TYPED( Deactivate, Menu *, bool ); DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void ); void RemoveListener(); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 3acc8c6fe3f2..78fb5a03f0c6 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -140,7 +140,7 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK_TYPED( MenuButton, ToolBox *, void ); DECL_LINK( MenuSelect, Menu * ); - DECL_LINK( MenuDeactivate, Menu * ); + DECL_LINK_TYPED( MenuDeactivate, Menu *, bool ); DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void); DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* ); |