diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 23:03:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 07:50:13 +0200 |
| commit | 0c415f61e4d2fb4efc50fe0401376657af47d203 (patch) | |
| tree | 8befceb3c180c28aae188200cb66222794b3fc04 /framework | |
| parent | e658cb4d5ce49d3a3c6acc63155974b5ff8490c7 (diff) | |
Use typed Menu::SetHighlightHdl Link
Change-Id: I47a35813fddcb90497b621a96bafe74969dc90d0
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/menumanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 5f23d3d65fa7..92dc2d6028cd 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -75,7 +75,7 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener ); protected: - DECL_LINK(Highlight, void *); + DECL_LINK_TYPED(Highlight, Menu *, bool); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 62861506b9fb..23cd41d5a54a 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -151,7 +151,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void GetPopupController( PopupControllerCache& rPopupController ); protected: - DECL_LINK(Highlight, void *); + DECL_LINK_TYPED(Highlight, Menu *, bool); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void ); diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index fdfef14c28d6..761d903e8ddf 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -890,9 +890,9 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) return 1; } -IMPL_LINK_NOARG(MenuManager, Highlight) +IMPL_LINK_NOARG_TYPED(MenuManager, Highlight, Menu *, bool) { - return 0; + return false; } void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,bool _bDelete,bool _bDeleteChildren) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index b06fa6a10751..785080c29f83 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1023,9 +1023,9 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) return 1; } -IMPL_LINK_NOARG(MenuBarManager, Highlight) +IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool) { - return 0; + return false; } bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer ) |