diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-06 12:05:08 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 06:56:57 +0000 |
commit | 9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch) | |
tree | 1bab2dbd1185adf86714718f5fb1a757c1a101e9 /include | |
parent | 67a5fbeb8e2d6775ff6bd7bfd35ff5027d38457c (diff) |
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/mnumgr.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/templatedlg.hxx | 8 | ||||
-rw-r--r-- | include/svx/SmartTagCtl.hxx | 2 | ||||
-rw-r--r-- | include/svx/ruler.hxx | 4 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 786b477b6cc1..ab0292ccf00e 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -57,7 +57,7 @@ protected: ~SfxMenuManager(); public: - DECL_LINK( Select, Menu* ); + DECL_LINK_TYPED( Select, Menu*, bool ); SfxVirtualMenu* GetMenu() const { return pMenu; } diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index d3aabbc8c2ba..bf363edf415e 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -231,7 +231,7 @@ private: const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; ::boost::shared_ptr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - DECL_LINK(OnMenuItemSelected, Menu*); + DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index ceb96c211106..e2192cff44ce 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -72,10 +72,10 @@ private: DECL_LINK_TYPED(TVItemStateHdl, const ThumbnailViewItem*, void); - DECL_LINK(MenuSelectHdl, Menu*); - DECL_LINK(MoveMenuSelectHdl, Menu*); - DECL_LINK(RepositoryMenuSelectHdl, Menu*); - DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*); + DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool); + DECL_LINK_TYPED(MoveMenuSelectHdl, Menu*, bool); + DECL_LINK_TYPED(RepositoryMenuSelectHdl, Menu*, bool); + DECL_LINK_TYPED(DefaultTemplateMenuSelectHdl, Menu*, bool); DECL_LINK_TYPED(OpenRegionHdl, void*, void); DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx index aadd8bb3ce84..ba618a785998 100644 --- a/include/svx/SmartTagCtl.hxx +++ b/include/svx/SmartTagCtl.hxx @@ -61,7 +61,7 @@ private: std::vector< InvokeAction > maInvokeActions; void FillMenu(); - DECL_LINK( MenuSelect, PopupMenu * ); + DECL_LINK_TYPED( MenuSelect, Menu *, bool); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index c4bec963cb9b..96432c60a3c5 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -214,8 +214,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long GetLeftMin() const; long GetRightMax() const; - DECL_LINK( TabMenuSelect, Menu * ); - DECL_LINK( MenuSelect, Menu * ); + DECL_LINK_TYPED( TabMenuSelect, Menu *, bool ); + DECL_LINK_TYPED( MenuSelect, Menu *, bool ); void PrepareProportional_Impl(RulerType); enum UpdateType diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 2c77726ad0bc..1d22bdc22eb6 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -139,7 +139,7 @@ private: Link<Menu*, bool> aActivateHdl; // Active-Handler Link<Menu*, bool> aDeactivateHdl; // Deactivate-Handler Link<Menu*, bool> aHighlightHdl; // Highlight-Handler - Link<> aSelectHdl; // Highlight-Handler + Link<Menu*, bool> aSelectHdl; // Highlight-Handler VclEventListeners maEventListeners; VclEventListeners maChildEventListeners; @@ -347,7 +347,7 @@ public: aHighlightHdl = rLink; } - void SetSelectHdl( const Link<>& rLink ) + void SetSelectHdl( const Link<Menu*,bool>& rLink ) { aSelectHdl = rLink; } |