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 /include | |
| parent | 0c415f61e4d2fb4efc50fe0401376657af47d203 (diff) | |
Use typed Menu::Set[De]actuivateHdl Links
Change-Id: I6736383ad0ec5c9f2ea2281bfdcfa280cd712032
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/mnuitem.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 98f0cc1a95d3..0d40854922a5 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -127,7 +127,7 @@ class SfxAppMenuControl_Impl : public SfxMenuControl bool m_bShowMenuImages; protected: - DECL_LINK( Activate, Menu * ); // Needed to support high contrast images + DECL_LINK_TYPED( Activate, Menu *, bool ); // Needed to support high contrast images public: SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 352efaf6628b..7c570f0f646b 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -126,8 +126,8 @@ private: Menu* pStartedFrom; VclPtr<vcl::Window> pWindow; - Link<> aActivateHdl; // Active-Handler - Link<> aDeactivateHdl; // Deactivate-Handler + Link<Menu *, bool> aActivateHdl; // Active-Handler + Link<Menu *, bool> aDeactivateHdl; // Deactivate-Handler Link<Menu *, bool> aHighlightHdl; // Highlight-Handler Link<> aSelectHdl; // Highlight-Handler @@ -320,11 +320,9 @@ public: void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); OString GetHelpId( sal_uInt16 nItemId ) const; - void SetActivateHdl( const Link<>& rLink ) { aActivateHdl = rLink; } - const Link<>& GetActivateHdl() const { return aActivateHdl; } + void SetActivateHdl( const Link<Menu *, bool>& rLink ) { aActivateHdl = rLink; } - void SetDeactivateHdl( const Link<>& rLink ) { aDeactivateHdl = rLink; } - const Link<>& GetDeactivateHdl() const { return aDeactivateHdl; } + void SetDeactivateHdl( const Link<Menu *, bool>& rLink ) { aDeactivateHdl = rLink; } void SetHighlightHdl( const Link<Menu *, bool>& rLink ) { aHighlightHdl = rLink; } |