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 /starmath | |
| parent | f593be5bcde09965bb3478e00bcdedbc6bd5bc57 (diff) | |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/toolbox.hxx | 4 | ||||
| -rw-r--r-- | starmath/source/toolbox.cxx | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 1af665e78954..5c03f5210e22 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -52,8 +52,8 @@ protected: void ApplyImageLists( sal_uInt16 nCategoryRID ); - DECL_LINK( CategoryClickHdl, ToolBox* ); - DECL_LINK( CmdSelectHdl, ToolBox* ); + DECL_LINK_TYPED( CategoryClickHdl, ToolBox*, void ); + DECL_LINK_TYPED( CmdSelectHdl, ToolBox*, void ); SmViewShell * GetView(); const ImageList * GetImageList( sal_uInt16 nResId ); diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 7416beb8559b..0182ce404f3a 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -329,24 +329,22 @@ sal_uInt16 SmToolBoxWindow::MapToolbarIdToCategory(sal_uInt16 nId) const return RID_MISC_CAT; } -IMPL_LINK( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox) +IMPL_LINK_TYPED( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox, void) { sal_uInt16 nItemId = pToolBox->GetCurItemId(); if (nItemId != 0) { SetCategory(MapToolbarIdToCategory(nItemId)); } - return 0; } -IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox) +IMPL_LINK_TYPED( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox, void) { SmViewShell *pViewSh = GetView(); if (pViewSh) pViewSh->GetViewFrame()->GetDispatcher()->Execute( SID_INSERTCOMMAND, SfxCallMode::RECORD, new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L); - return 0; } |