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 /sw/source/ui | |
parent | f593be5bcde09965bb3478e00bcdedbc6bd5bc57 (diff) |
Use various typed ToolBox::Set*Hdl Links
Change-Id: Iddfd36ae0de86fdd2d4febb2c05d1fe0c02801f0
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/envelp/envprt.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/envelp/envprt.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.hxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 10b3a0d323de..2b4379d97895 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -127,7 +127,7 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn ) return 0; } -IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) +IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void) { if (m_pAlignBox->GetCurItemId()) { @@ -141,7 +141,6 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) const SwEnvItem& rItem = static_cast<const SwEnvItem&>( GetItemSet().Get(FN_ENVELOP) ); m_pAlignBox->CheckItem(m_aIds[rItem.eAlign], true); } - return 0; } VclPtr<SfxTabPage> SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index a71c96b3a9e6..33c553032802 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -48,7 +48,7 @@ class SwEnvPrtPage : public SfxTabPage VclPtr<Printer> pPrt; DECL_LINK(ClickHdl, void *); - DECL_LINK(AlignHdl, void *); + DECL_LINK_TYPED(AlignHdl, ToolBox *, void); DECL_LINK( ButtonHdl, Button * ); SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>( GetParentDialog());} diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index f4b783cc2ae6..06774c80a89d 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -954,7 +954,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl) return 0; } -IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) +IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void ) { const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -1096,8 +1096,6 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) UpdateSubType(); } - - return sal_True; } IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl) diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index a37aa5809fda..a7bf3f0163ac 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -79,7 +79,7 @@ class SwFldVarPage : public SwFldPage DECL_LINK(TypeHdl, void *); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); DECL_LINK(ModifyHdl, void * = 0); - DECL_LINK( TBClickHdl, ToolBox *pTB = 0); + DECL_LINK_TYPED( TBClickHdl, ToolBox *, void ); DECL_LINK(ChapterHdl, void * = 0); DECL_LINK(SeparatorHdl, void * = 0); |