Convert vcl Button Link<> click handler to typed Link<Button*,void>

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

18 files changed, 47 insertions, 78 deletions

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 0512a142a3c5..72589c51c7b4 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -644,17 +644,15 @@ bool ScPivotLayoutDialog::Close()
     return DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
 }
 
-IMPL_LINK( ScPivotLayoutDialog, OKClicked, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, OKClicked, Button*, void )
 {
     ApplyChanges();
     Close();
-    return 0;
 }
 
-IMPL_LINK( ScPivotLayoutDialog, CancelClicked, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, CancelClicked, Button*, void )
 {
     Close();
-    return 0;
 }
 
 IMPL_LINK(ScPivotLayoutDialog, GetFocusHandler, Control*, pCtrl)
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 17092f568f88..c2cafd34d345 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -363,7 +363,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr )
     return 0;
 }
 
-IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
+IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void)
 {
     sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount();
 
@@ -419,10 +419,9 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
     }
     else
         Close(); // no area defined -> Cancel
-    return 0;
 }
 
-IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void )
 {
     if ( pBtn == pBtnCancel )
         Close();
@@ -484,7 +483,6 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
             pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectEntryPos() );
         pBtnRemove->Disable();
     }
-    return 0;
 }
 
 IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 35407ade36b8..b920e3a0a9a0 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -98,10 +98,9 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
     }
 }
 
-IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void )
 {
     m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange);
-    return 0;
 }
 
 ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent,
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 8854ecdd082c..4ebe1d0e89e7 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -394,7 +394,7 @@ bool ScDbNameDlg::IsRefInputMode() const
 
 // Handler:
 
-IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void)
 {
     AddBtnHdl( 0 );
 
@@ -408,16 +408,14 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl)
     }
 
     Close();
-    return 0;
 }
 
-IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScDbNameDlg, CancelBtnHdl, Button*, void)
 {
     Close();
-    return 0;
 }
 
-IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AddBtnHdl, Button*, void)
 {
     OUString  aNewName = comphelper::string::strip(m_pEdName->GetText(), ' ');
     OUString  aNewArea = m_pEdAssign->GetText();
@@ -499,7 +497,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
             m_pEdName->GrabFocus();
         }
     }
-    return 0;
 }
 
 namespace {
@@ -517,7 +514,7 @@ public:
 
 }
 
-IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
+IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void)
 {
     OUString aStrEntry = m_pEdName->GetText();
     ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs();
@@ -566,7 +563,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
             NameModifyHdl( 0 );
         }
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 7bbb0fd80985..0c1a9cefd906 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -92,7 +92,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue )
     ImplSetValue( fValue );
 }
 
-IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton )
+IMPL_LINK_TYPED( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void )
 {
     if( pButton == mpRbAuto )
     {
@@ -105,7 +105,6 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton )
         mpEdValue->Enable();
         mpEdValue->GrabFocus();
     }
-    return 0;
 }
 
 ScDPNumGroupEditHelper::ScDPNumGroupEditHelper(
@@ -332,7 +331,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const
     return nDatePart;
 }
 
-IMPL_LINK( ScDPDateGroupDlg, ClickHdl, RadioButton*, pButton )
+IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void )
 {
     if( pButton == mpRbNumDays )
     {
@@ -351,7 +350,6 @@ IMPL_LINK( ScDPDateGroupDlg, ClickHdl, RadioButton*, pButton )
         // disable OK button if no date part selected
         CheckHdl( mpLbUnits );
     }
-    return 0;
 }
 
 IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox )
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 3a3cf7a53e6a..23d2a08e6df9 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -707,7 +707,7 @@ bool ScFilterDlg::IsRefInputMode() const
 
 // Handler:
 
-IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
+IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void )
 {
     if ( pBtn == pBtnOk )
     {
@@ -740,8 +740,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
     {
         Close();
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl)
@@ -1023,7 +1021,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
     return 0;
 }
 
-IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void )
 {
     //  Column headers:
     //      Field list: Columnxx <-> column header string
@@ -1057,8 +1055,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
         UpdateValueList( 3 );
         UpdateValueList( 4 );
     }
-
-    return 0;
 }
 
 IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 18f2072731e2..42d25e6dc9ea 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -523,7 +523,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
     return 0;
 }
 
-IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void )
 {
     //  bei Gross-/Kleinschreibung die Werte-Listen aktualisieren
 
@@ -542,8 +542,6 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
         m_pEdVal2->SetText( aCurVal2 );
         m_pEdVal3->SetText( aCurVal3 );
     }
-
-    return 0;
 }
 
 IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index d728f83b5d5b..3e9c012db054 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -523,10 +523,9 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa
     mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
 }
 
-IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void )
 {
     mpLbFunc->Enable( pBtn == mpRbUser );
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl)
@@ -535,7 +534,7 @@ IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl)
     return 0;
 }
 
-IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void )
 {
     if (pBtn == mpBtnOptions)
     {
@@ -543,7 +542,6 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn )
         if( pDlg->Execute() == RET_OK )
             pDlg->FillLabelData( maLabelData );
     }
-    return 0;
 }
 
 ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj,
@@ -795,13 +793,12 @@ sal_Int32 ScDPSubtotalOptDlg::FindListBoxEntry(
     return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND;
 }
 
-IMPL_LINK( ScDPSubtotalOptDlg, RadioClickHdl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void )
 {
     m_pLbSortBy->Enable( pBtn != m_pRbSortMan );
-    return 0;
 }
 
-IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, CheckBox*, pCBox )
+IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void )
 {
     if (pCBox == m_pCbShow)
     {
@@ -815,7 +812,6 @@ IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, CheckBox*, pCBox )
         m_pFtShowUsing->Enable(bEnableUsing);
         m_pLbShowUsing->Enable(bEnableUsing);
     }
-    return 0;
 }
 
 IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox )
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 6f1381c8ef18..fe3514d932bd 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -162,7 +162,7 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r
     m_pCbProtect->Check    ( (nFlags & SC_SCENARIO_PROTECT)     != 0 );
 }
 
-IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl)
+IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void)
 {
     OUString      aName = comphelper::string::strip(m_pEdName->GetText(), ' ');
     ScDocument* pDoc    = static_cast<ScTabViewShell*>(SfxViewShell::Current())->GetViewData().GetDocument();
@@ -181,16 +181,14 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl)
     }
     else
         EndDialog( RET_OK );
-    return 0;
 
     //! beim Editieren testen, ob eine andere Tabelle den Namen hat!
 }
 
-IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox )
+IMPL_LINK_TYPED( ScNewScenarioDlg, EnableHdl, Button*, pBox, void )
 {
     if (pBox == m_pCbShowFrame)
         m_pLbColor->Enable( m_pCbShowFrame->IsChecked() );
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 3f348769af9d..b45b5d467f6d 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -371,16 +371,17 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
     pCbTextSep->SetText( sTextSeparators );
 
     Link<> aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
+    Link<Button*,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl );
     pCbTextSep->SetSelectHdl( aSeparatorHdl );
     pCbTextSep->SetModifyHdl( aSeparatorHdl );
-    pCkbTab->SetClickHdl( aSeparatorHdl );
-    pCkbSemicolon->SetClickHdl( aSeparatorHdl );
-    pCkbComma->SetClickHdl( aSeparatorHdl );
-    pCkbAsOnce->SetClickHdl( aSeparatorHdl );
-    pCkbQuotedAsText->SetClickHdl( aSeparatorHdl );
-    pCkbDetectNumber->SetClickHdl( aSeparatorHdl );
-    pCkbSpace->SetClickHdl( aSeparatorHdl );
-    pCkbOther->SetClickHdl( aSeparatorHdl );
+    pCkbTab->SetClickHdl( aSeparatorClickHdl );
+    pCkbSemicolon->SetClickHdl( aSeparatorClickHdl );
+    pCkbComma->SetClickHdl( aSeparatorClickHdl );
+    pCkbAsOnce->SetClickHdl( aSeparatorClickHdl );
+    pCkbQuotedAsText->SetClickHdl( aSeparatorClickHdl );
+    pCkbDetectNumber->SetClickHdl( aSeparatorClickHdl );
+    pCkbSpace->SetClickHdl( aSeparatorClickHdl );
+    pCkbOther->SetClickHdl( aSeparatorClickHdl );
     pEdOther->SetModifyHdl( aSeparatorHdl );
 
     // *** text encoding ListBox ***
@@ -658,7 +659,7 @@ void ScImportAsciiDlg::UpdateVertical()
         mpDatStream->SetStreamCharSet(meCharSet);
 }
 
-IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton )
+IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void )
 {
     OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" );
 
@@ -673,9 +674,12 @@ IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton )
 
         SetupSeparatorCtrls();
     }
-    return 0;
 }
 
+IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void )
+{
+    SeparatorHdl(pCtrl);
+}
 IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl )
 {
     OSL_ENSURE( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" );
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 8d75619fe006..06d8fea36cd7 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -302,7 +302,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
     return nCode;
 }
 
-IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox )
+IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void )
 {
     if (pCheckBox == m_pCbFixed)
     {
@@ -314,7 +314,6 @@ IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox )
         m_pCbShown->Enable( bEnable );
         m_pCbQuoteAll->Enable( bEnable );
     }
-    return 0;
 }
 
 IMPL_LINK( ScImportOptionsDlg, DoubleClickHdl, ListBox*, pLb )
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 08e62128c496..a15b9a670802 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -285,7 +285,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const
 
 // Handler:
 
-IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
+IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void )
 {
     OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" );
 
@@ -398,7 +398,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
     {
         Close();
     }
-    return 0;
 }
 
 IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void )
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 35848bfdbe23..a5a6d567698f 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -63,7 +63,7 @@ void ScSortWarningDlg::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( ScSortWarningDlg, BtnHdl, Button*, pBtn, void )
 {
     if ( pBtn == aBtnExtSort )
     {
@@ -73,7 +73,6 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn )
     {
         EndDialog( BTN_CURRENT_SELECTION );
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 9e34ba7e35ae..42593d0e31ac 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -47,13 +47,12 @@ void ScSubTotalDlg::dispose()
     SfxTabDialog::dispose();
 }
 
-IMPL_LINK( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
+IMPL_LINK_TYPED( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void )
 {
     if (pBtn == m_pBtnRemove)
     {
         EndDialog( SCRET_REMOVE );
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 9971bb8bc129..900eb07cb22a 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -72,7 +72,7 @@ bool ScTextImportOptionsDlg::isDateConversionSet() const
 
 void ScTextImportOptionsDlg::init()
 {
-    Link<> aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
+    Link<Button*,void> aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
     m_pBtnOk->SetClickHdl(aLink);
     aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl );
     m_pRbAutomatic->SetClickHdl(aLink);
@@ -88,13 +88,12 @@ void ScTextImportOptionsDlg::init()
     m_pLbCustomLang->Disable();
 }
 
-IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl)
+IMPL_LINK_NOARG_TYPED(ScTextImportOptionsDlg, OKHdl, Button*, void)
 {
     EndDialog(RET_OK);
-    return 0;
 }
 
-IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void )
 {
     if (pBtn == m_pRbAutomatic)
     {
@@ -104,7 +103,6 @@ IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn )
     {
         m_pLbCustomLang->Enable();
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index c5336a7c2fd7..176651486f3d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -847,8 +847,9 @@ void ScTabPageSortOptions::FillUserSortListBox()
 
 // Handler:
 
-IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox )
+IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void )
 {
+    CheckBox* pBox = static_cast<CheckBox*>(pButton);
     if (pBox == m_pBtnCopyResult)
     {
         if ( pBox->IsChecked() )
@@ -873,7 +874,6 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox )
         else
             m_pLbSortUser->Disable();
     }
-    return 0;
 }
 
 IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
@@ -891,7 +891,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
     return 0;
 }
 
-IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
+IMPL_LINK_TYPED( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void )
 {
     if (pBtn == m_pBtnTopDown)
     {
@@ -901,7 +901,6 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
     {
         m_pBtnHeader->SetText( aStrRowLabel );
     }
-    return 0;
 }
 
 void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 25d3ad90d39e..65fb0590005b 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -564,7 +564,7 @@ void ScTpSubTotalOptions::FillUserSortListBox()
 
 // Handler:
 
-IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
+IMPL_LINK_TYPED( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void )
 {
     if ( pBox == pBtnSort )
     {
@@ -599,8 +599,6 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
         else
             pLbUserDef->Disable();
     }
-
-    return 0;
 }
 
 ScTpSubTotalGroup1::~ScTpSubTotalGroup1()
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 40be7f26f420..196223bbca1d 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -663,10 +663,9 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl)
+IMPL_LINK_NOARG_TYPED(ScTPValidationValue, CheckHdl, Button*, void)
 {
     m_pCbSort->Enable( m_pCbShow->IsChecked() );
-    return 0;
 }
 
 // Input Help Page
@@ -841,7 +840,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl)
     return 0L;
 }
 
-IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl)
+IMPL_LINK_NOARG_TYPED(ScTPValidationError, ClickSearchHdl, Button*, void)
 {
     vcl::Window* pOld = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
@@ -856,8 +855,6 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl)
     {
         m_pEdtTitle->SetText( aScriptURL );
     }
-
-    return 0L;
 }
 
 bool ScValidationDlg::EnterRefStatus()