diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-28 16:20:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-31 09:50:10 +0200 |
commit | 410c06bec452b09cd15ddfcb82b8b2b0508f3c55 (patch) | |
tree | a7841b14e58bf02a3f45d5a0547dc711b3dc7cba /cui/source | |
parent | 32673845809df70efe2651c3ca82f574245279c2 (diff) |
convert Link<> to typed
and remove some dead code
Change-Id: I608ed684fafb33390d869f7ebd4000c53d7fb28d
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/inc/iconcdlg.hxx | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index b24807bea094..e40135cbf06e 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -356,7 +356,7 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) | select a page | \**********************************************************************/ -IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) +IMPL_LINK_NOARG_TYPED(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void) { SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry(); if ( !pEntry ) @@ -368,8 +368,6 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) { ShowPage(*pId); } - - return 0L; } /********************************************************************** diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index b34f4e396bde..d95edc8b50f1 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -141,11 +141,11 @@ private: bool bInOK; bool bItemsReset; - DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK_TYPED(OkHdl, Button*, void); - DECL_LINK_TYPED(ApplyHdl, Button*, void); - DECL_LINK_TYPED(ResetHdl, Button*, void); - DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK_TYPED( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); + DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK_TYPED( ApplyHdl, Button*, void) ; + DECL_LINK_TYPED( ResetHdl, Button*, void) ; + DECL_LINK_TYPED( CancelHdl, Button*, void ); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); |