diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 22:43:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 08:20:55 +0200 |
| commit | b515d1f36fdf8c242079da60eb4ecd5fd456583c (patch) | |
| tree | f26dd6feb936ddec4799bed60d4966d46acff938 /include/sfx2 | |
| parent | f593be5bcde09965bb3478e00bcdedbc6bd5bc57 (diff) | |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/templatedlg.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/titledockwin.hxx | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 80ae7a117d28..8663c4b2c586 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -78,10 +78,10 @@ private: ControllerContainer maControllers; bool mbAreHandlersRegistered; - DECL_LINK(DropDownClickHandler, ToolBox*); - DECL_LINK(ClickHandler, ToolBox*); - DECL_LINK(DoubleClickHandler, ToolBox*); - DECL_LINK(SelectHandler, ToolBox*); + DECL_LINK_TYPED(DropDownClickHandler, ToolBox*, void); + DECL_LINK_TYPED(ClickHandler, ToolBox*, void); + DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void); + DECL_LINK_TYPED(SelectHandler, ToolBox*, void); DECL_LINK(ActivateToolBox, ToolBox*); DECL_LINK(DeactivateToolBox, ToolBox*); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index f26792bb0a04..0d06c3cc00f2 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -65,10 +65,10 @@ private: void writeSettings (); - DECL_LINK(TBXViewHdl, void*); - DECL_LINK(TBXActionHdl, void*); - DECL_LINK(TBXTemplateHdl, void*); - DECL_LINK(TBXDropdownHdl, ToolBox*); + DECL_LINK_TYPED(TBXViewHdl, ToolBox*, void); + DECL_LINK_TYPED(TBXActionHdl, ToolBox*, void); + DECL_LINK_TYPED(TBXTemplateHdl, ToolBox*, void); + DECL_LINK_TYPED(TBXDropdownHdl, ToolBox*, void); DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*); diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index f86245c69de6..8293eb00aa98 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -61,7 +61,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -111,7 +111,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback ); /** returns the current title. @@ -120,7 +120,7 @@ namespace sfx2 OUString impl_getTitle() const; private: - DECL_LINK( OnToolboxItemSelected, ToolBox* ); + DECL_LINK_TYPED( OnToolboxItemSelected, ToolBox*, void ); void impl_construct(); void impl_layout(); |