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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

4 files changed, 29 insertions, 49 deletions

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index ad03fa047c51..b21c252bc1e6 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -67,7 +67,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog
     bool                m_bStop;
 
     void                Test();
-    DECL_LINK(StopHdl, void *);
+    DECL_LINK_TYPED(StopHdl, Button*, void);
     DECL_LINK(TestHdl, void*);
 public:
     explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent);
@@ -105,9 +105,9 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog
 
     SwMailMergeConfigItem& rConfigItem;
 
-    DECL_LINK(OKHdl_Impl, void *);
-    DECL_LINK( CheckBoxHdl_Impl, CheckBox*);
-    DECL_LINK(RadioButtonHdl_Impl, void *);
+    DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
+    DECL_LINK_TYPED( CheckBoxHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(RadioButtonHdl_Impl, Button*, void);
 
 public:
     SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem);
@@ -207,25 +207,22 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ )
     m_pSecureCB     ->SaveValue();
 }
 
-IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SwMailConfigPage, ReplyToHdl, Button*, pBox, void)
 {
-    bool bEnable = pBox->IsChecked();
+    bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked();
     m_pReplyToFT->Enable(bEnable);
     m_pReplyToED->Enable(bEnable);
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl)
+IMPL_LINK_NOARG_TYPED(SwMailConfigPage, AuthenticationHdl, Button*, void)
 {
     ScopedVclPtrInstance< SwAuthenticationSettingsDialog > aDlg(this, *m_pConfigItem);
     aDlg->Execute();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwMailConfigPage, TestHdl)
+IMPL_LINK_NOARG_TYPED(SwMailConfigPage, TestHdl, Button*, void)
 {
     ScopedVclPtrInstance<SwTestAccountSettingsDialog>::Create(this)->Execute();
-    return 0;
 }
 
 SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent)
@@ -276,10 +273,9 @@ void SwTestAccountSettingsDialog::dispose()
     SfxModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SwTestAccountSettingsDialog, StopHdl)
+IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void)
 {
     m_bStop = true;
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl)
@@ -425,7 +421,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
     get(m_pOKPB,"ok");
 
     m_pAuthenticationCB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl));
-    Link<> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
+    Link<Button*,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
     m_pSeparateAuthenticationRB->SetClickHdl( aRBLink );
     m_pSMTPAfterPOPRB->SetClickHdl( aRBLink );
     m_pOKPB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl));
@@ -481,7 +477,7 @@ void SwAuthenticationSettingsDialog::dispose()
     SfxModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void)
 {
     rConfigItem.SetAuthentication( m_pAuthenticationCB->IsChecked() );
     rConfigItem.SetSMTPAfterPOP(m_pSMTPAfterPOPRB->IsChecked());
@@ -494,20 +490,17 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl)
 
     rConfigItem.SetInServerPassword(m_pInPasswordED->GetText());
     EndDialog(RET_OK);
-    return 0;
 }
 
-IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox)
+IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void)
 {
-    bool bChecked = pBox->IsChecked();
+    bool bChecked = static_cast<CheckBox*>(pBox)->IsChecked();
     m_pSeparateAuthenticationRB->Enable(bChecked);
     m_pSMTPAfterPOPRB->Enable(bChecked);
     RadioButtonHdl_Impl( 0 );
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void)
 {
     bool bSeparate = m_pSeparateAuthenticationRB->IsChecked();
     bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled();
@@ -532,8 +525,6 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl)
     m_pIMAPRB->Enable(bNotSeparate);
     m_pInPasswordFT->Enable(bNotSeparate);
     m_pInPasswordED->Enable(bNotSeparate);
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index a43554d65fb0..cc674d8f57ed 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl)
+IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void)
 {
     ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDefaultCompatDialog",
                                                "modules/swriter/ui/querydefaultcompatdialog.ui");
@@ -358,8 +358,6 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl)
 
         WriteOptions();
     }
-
-    return 0;
 }
 
 void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index fecd2a010823..df64fbd2a2d3 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -120,7 +120,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
         m_pUseCharUnit->Hide();
     }
 
-    Link<> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl);
+    Link<Button*,void> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl);
     m_pShowStandardizedPageCount->SetClickHdl(aLink);
 }
 
@@ -154,10 +154,9 @@ VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent,
     return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet );
 }
 
-IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl)
+IMPL_LINK_NOARG_TYPED(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void)
 {
     m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked());
-    return 0;
 }
 
 bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 2fccfb5baadc..a87396de73a6 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -286,10 +286,9 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
     return bRet;
 }
 
-IMPL_LINK(SwContentOptPage, VertRulerHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SwContentOptPage, VertRulerHdl, Button*, pBox, void)
 {
-    m_pVRulerRightCBox->Enable(pBox->IsEnabled() && pBox->IsChecked());
-    return 0;
+    m_pVRulerRightCBox->Enable(pBox->IsEnabled() && static_cast<CheckBox*>(pBox)->IsChecked());
 }
 
 // TabPage Printer additional settings
@@ -324,7 +323,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
     get(m_pPaperFromSetupCB, "papertray");
     get(m_pFaxLB, "fax");
 
-    Link<> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
+    Link<Button*,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
     m_pGrfCB->SetClickHdl( aLk );
     m_pRightPageCB->SetClickHdl( aLk );
     m_pLeftPageCB->SetClickHdl( aLk );
@@ -485,7 +484,7 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
         m_pProspectCB_RTL->Enable( false );
 }
 
-IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl)
+IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, AutoClickHdl, Button*, void)
 {
     bAttrModified = true;
     bool bIsProspect = m_pProspectCB->IsChecked();
@@ -497,7 +496,6 @@ IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl)
     m_pEndRB->Enable( !bIsProspect );
     m_pEndPageRB->Enable( !bIsProspect );
     m_pInMarginsRB->Enable( !bIsProspect );
-    return 0;
 }
 
 void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
@@ -943,7 +941,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
     pIndexHeightLB->SaveValue();
 }
 
-IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl)
+IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void)
 {
     sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP;
     pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, eLanguage));
@@ -973,7 +971,6 @@ IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl)
     pIndexHeightLB   ->SetValue(CalcToPoint(
         SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX    + nFontOffset, eLanguage),
             SFX_MAPUNIT_TWIP, 10 ));
-    return 0;
 }
 
 IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox )
@@ -1086,7 +1083,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte
     get(pFixPropRB,"fixprop");
     get(pVarRB,"var");
 
-    Link<> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
+    Link<Button*,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
     pNumFormattingCB->SetClickHdl(aLnk);
     pNumFormatFormattingCB->SetClickHdl(aLnk);
     pHeaderCB->SetClickHdl(aLnk);
@@ -1269,12 +1266,11 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
     CheckBoxHdl(0);
 }
 
-IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(SwTableOptionsTabPage, CheckBoxHdl, Button*, void)
 {
     pNumFormatFormattingCB->Enable(pNumFormattingCB->IsChecked());
     pNumAlignmentCB->Enable(pNumFormattingCB->IsChecked());
     pRepeatHeaderCB->Enable(pHeaderCB->IsChecked());
-    return 0;
 }
 
 void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet)
@@ -2287,7 +2283,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage(  vcl::Window* pParent, const S
     get(m_pLenNF, "ignorelen");
     get(m_pStoreRsidCB, "storeRSID");
 
-    Link<> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
+    Link<Button*,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
     m_pAutoRB->SetClickHdl( aLnk );
     m_pWordRB->SetClickHdl( aLnk );
     m_pCharRB->SetClickHdl( aLnk );
@@ -2408,20 +2404,17 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* )
     m_pStoreRsidCB->SaveValue();
 }
 
-IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl)
+IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void)
 {
     bool bChecked = !m_pAutoRB->IsChecked();
     m_pRsidCB->Enable( bChecked );
     m_pIgnoreCB->Enable( bChecked );
     m_pLenNF->Enable( bChecked && m_pIgnoreCB->IsChecked() );
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl)
+IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, IgnoreHdl, Button*, void)
 {
     m_pLenNF->Enable( m_pIgnoreCB->IsChecked() );
-    return 0;
 }
 
 #ifdef DBG_UTIL
@@ -2516,7 +2509,7 @@ void SwTestTabPage::Reset( const SfxItemSet* )
 void SwTestTabPage::Init()
 {
     // handler
-    Link<> aLk = LINK( this, SwTestTabPage, AutoClickHdl );
+    Link<Button*,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl );
     m_pTest1CBox->SetClickHdl( aLk );
     m_pTest2CBox->SetClickHdl( aLk );
     m_pTest3CBox->SetClickHdl( aLk );
@@ -2529,10 +2522,9 @@ void SwTestTabPage::Init()
     m_pTest10CBox->SetClickHdl( aLk );
 }
 
-IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl)
+IMPL_LINK_NOARG_TYPED(SwTestTabPage, AutoClickHdl, Button*, void)
 {
     bAttrModified = true;
-    return 0;
 }
 
 #endif