From 167bc621ef825ed5b961502fe9324a675ee34e42 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 19 Aug 2015 09:11:34 +0200 Subject: Convert vcl Button Link<> click handler to typed Link Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b --- svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx') diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index ff514d95b4b4..8fa15c13bf0f 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -66,19 +66,19 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) meLNSpaceUnit = SFX_MAPUNIT_100TH_MM; - Link<> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); + Link aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); mpSpacing1Button->SetClickHdl(aLink); mpSpacing115Button->SetClickHdl(aLink); mpSpacing15Button->SetClickHdl(aLink); mpSpacing2Button->SetClickHdl(aLink); - aLink = LINK( this, ParaLineSpacingControl, LineSPDistHdl_Impl ); - mpLineDist->SetSelectHdl(aLink); + Link<> aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistHdl_Impl ); + mpLineDist->SetSelectHdl(aLink2); SelectEntryPos(LLINESPACE_1); - aLink = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); - mpLineDistAtPercentBox->SetModifyHdl( aLink ); - mpLineDistAtMetricBox->SetModifyHdl( aLink ); + aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); + mpLineDistAtPercentBox->SetModifyHdl( aLink2 ); + mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); FieldUnit eUnit = FUNIT_INCH; const SfxPoolItem* pItem = NULL; @@ -409,7 +409,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, int eS } } -IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, void *, pControl) +IMPL_LINK_TYPED(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) { if (pControl == mpSpacing1Button) { @@ -427,8 +427,6 @@ IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, void *, pControl) { ExecuteLineSpacing(LLINESPACE_2); } - - return 0; } void ParaLineSpacingControl::ExecuteLineSpacing(sal_uInt16 nEntry) -- cgit