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 /sd/source | |
| parent | f593be5bcde09965bb3478e00bcdedbc6bd5bc57 (diff) | |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/inc/navigatr.hxx | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 7a0368dd6c0c..987818b84751 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -259,7 +259,7 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc ) return pDocShell; } -IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) +IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) { sal_uInt16 nId = maToolbox->GetCurItemId(); sal_uInt16 nSId = 0; @@ -306,15 +306,12 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) } break; } - return 0; } -IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl) -{ - return 0; -} +IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickToolboxHdl, ToolBox *, void) +{} -IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) +IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) { sal_uInt16 nId = maToolbox->GetCurItemId(); @@ -387,7 +384,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) } break; } - return 0; } IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index aae2ba0fa7a7..ed682fdd9254 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -145,9 +145,9 @@ private: NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); - DECL_LINK( SelectToolboxHdl, void * ); - DECL_LINK(ClickToolboxHdl, void *); - DECL_LINK( DropdownClickToolBoxHdl, ToolBox * ); + DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); + DECL_LINK_TYPED(ClickToolboxHdl, ToolBox *, void); + DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void ); DECL_LINK( ClickPageHdl, void * ); DECL_LINK( ClickObjectHdl, void * ); DECL_LINK( SelectDocumentHdl, void * ); |