diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-15 08:13:49 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-16 09:11:29 +0000 |
commit | 6f1313b3d44ea54e9a331e0fc00871081fa662fe (patch) | |
tree | fa6d9b6da04daedcb63ea2a0bc8c414288ed8bc6 /svx/source/sidebar/paragraph | |
parent | 14bf708ef586b15dffed66ffaf524baf4d8fcbfa (diff) |
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/sidebar/paragraph')
4 files changed, 9 insertions, 12 deletions
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index ab4f82bae9dd..12128d72f463 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -76,7 +76,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) mpLineDist->SetSelectHdl(aLink3); SelectEntryPos(LLINESPACE_1); - Link<> aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); + Link<Edit&,void> aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); mpLineDistAtPercentBox->SetModifyHdl( aLink2 ); mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); @@ -327,10 +327,9 @@ IMPL_LINK_NOARG_TYPED(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox&, void ExecuteLineSpace(); } -IMPL_LINK_NOARG( ParaLineSpacingControl, LineSPDistAtHdl_Impl ) +IMPL_LINK_NOARG_TYPED( ParaLineSpacingControl, LineSPDistAtHdl_Impl, Edit&, void ) { ExecuteLineSpace(); - return 0L; } void ParaLineSpacingControl::ExecuteLineSpace() diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index e9f21788858c..1d27c40c69d1 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -70,7 +70,7 @@ private: void SelectEntryPos(sal_Int32 nPos); DECL_LINK_TYPED(LineSPDistHdl_Impl, ListBox&, void); - DECL_LINK(LineSPDistAtHdl_Impl, void*); + DECL_LINK_TYPED(LineSPDistAtHdl_Impl, Edit&, void); DECL_LINK_TYPED(PredefinedValuesHandler, Button*, void); }; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index eb44e60cae7e..aed071486bcd 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -168,7 +168,7 @@ void ParaPropertyPanel::ReSize(bool /* bSize */) void ParaPropertyPanel::InitToolBoxIndent() { - Link<> aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl ); mpLeftIndent->SetModifyHdl( aLink ); mpRightIndent->SetModifyHdl( aLink ); mpFLineIndent->SetModifyHdl( aLink ); @@ -191,7 +191,7 @@ void ParaPropertyPanel::InitToolBoxIndent() void ParaPropertyPanel::InitToolBoxSpacing() { - Link<> aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl ); mpTopDist->SetModifyHdl(aLink); mpBottomDist->SetModifyHdl( aLink ); @@ -208,7 +208,7 @@ void ParaPropertyPanel::initial() } // for Paragraph Indent -IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl) +IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) { SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) ); @@ -217,7 +217,6 @@ IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl) GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L); - return 0; } IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void) @@ -300,7 +299,7 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont } // for Paragraph Spacing -IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl) +IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void) { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); aMargin.SetUpper( (sal_uInt16)GetCoreValue( *mpTopDist, m_eULSpaceUnit ) ); @@ -308,7 +307,6 @@ IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl) GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, &aMargin, 0L); - return 0L; } // for Paragraph State change diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 4182ac883c21..70a2c20fa0f6 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -113,9 +113,9 @@ private: SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; - DECL_LINK(ModifyIndentHdl_Impl, void*); + DECL_LINK_TYPED(ModifyIndentHdl_Impl, Edit&, void); DECL_LINK_TYPED(ClickIndent_IncDec_Hdl_Impl, ToolBox*, void); - DECL_LINK(ULSpaceHdl_Impl, void*); + DECL_LINK_TYPED(ULSpaceHdl_Impl, Edit&, void); void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); |