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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

4 files changed, 41 insertions, 70 deletions

diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 866c2f006e76..e8f166506de4 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -147,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     }
     mpKeepColumn->SaveValue();
 
-    Link<> aLk( LINK(this, SwConvertTableDlg, BtnHdl) );
+    Link<Button*,void> aLk( LINK(this, SwConvertTableDlg, BtnHdl) );
     mpTabBtn->SetClickHdl( aLk );
     mpSemiBtn->SetClickHdl( aLk );
     mpParaBtn->SetClickHdl( aLk );
@@ -197,7 +197,7 @@ void SwConvertTableDlg::dispose()
     SfxModalDialog::dispose();
 }
 
-IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton )
+IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -206,10 +206,9 @@ IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton )
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFormatOfIndex( pTAutoFormat );
-    return 0;
 }
 
-IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton )
+IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void )
 {
     if( pButton == mpTabBtn )
         mpKeepColumn->SetState( mpKeepColumn->GetSavedValue() );
@@ -221,22 +220,18 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton )
     }
     mpKeepColumn->Enable( mpTabBtn->IsChecked() );
     mpOtherEd->Enable( mpOtherBtn->IsChecked() );
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, CheckBoxHdl, Button*, void)
 {
     mpRepeatHeaderCB->Enable(mpHeaderCB->IsChecked());
     ReapeatHeaderCheckBoxHdl();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void)
 {
     bool bEnable = mpHeaderCB->IsChecked() && mpRepeatHeaderCB->IsChecked();
     mpRepeatRows->Enable(bEnable);
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e471c9cf5d59..ad62d2def1e7 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -129,10 +129,9 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
     m_pRepeatHeaderNF->SetMax( nMax );
 }
 
-IMPL_LINK_NOARG(SwInsTableDlg, OKHdl)
+IMPL_LINK_NOARG_TYPED(SwInsTableDlg, OKHdl, Button*, void)
 {
     EndDialog(RET_OK);
-    return 0;
 }
 
 SwInsTableDlg::~SwInsTableDlg()
@@ -200,7 +199,7 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
     return 0;
 }
 
-IMPL_LINK( SwInsTableDlg, AutoFormatHdl, PushButton*, pButton )
+IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -209,22 +208,17 @@ IMPL_LINK( SwInsTableDlg, AutoFormatHdl, PushButton*, pButton )
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFormatOfIndex( pTAutoFormat );
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(SwInsTableDlg, CheckBoxHdl, Button*, void)
 {
     m_pRepeatHeaderCB->Enable(m_pHeaderCB->IsChecked());
     ReapeatHeaderCheckBoxHdl();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwInsTableDlg, ReapeatHeaderCheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void)
 {
     m_pRepeatGroup->Enable(m_pHeaderCB->IsChecked() && m_pRepeatHeaderCB->IsChecked());
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1a490e2b2bf9..d16675521945 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -137,15 +137,15 @@ void  SwFormatTablePage::Init()
     m_aRightMF.SetMetricFieldMin(-999999);
 
     //handler
-    Link<> aLk = LINK( this, SwFormatTablePage, AutoClickHdl );
-    m_pFullBtn->SetClickHdl( aLk );
-    m_pFreeBtn->SetClickHdl( aLk );
-    m_pLeftBtn->SetClickHdl( aLk );
-    m_pFromLeftBtn->SetClickHdl( aLk );
-    m_pRightBtn->SetClickHdl( aLk );
-    m_pCenterBtn->SetClickHdl( aLk );
-
-    aLk = LINK( this, SwFormatTablePage, UpDownLoseFocusHdl );
+    Link<Button*,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl );
+    m_pFullBtn->SetClickHdl( aLk2 );
+    m_pFreeBtn->SetClickHdl( aLk2 );
+    m_pLeftBtn->SetClickHdl( aLk2 );
+    m_pFromLeftBtn->SetClickHdl( aLk2 );
+    m_pRightBtn->SetClickHdl( aLk2 );
+    m_pCenterBtn->SetClickHdl( aLk2 );
+
+    Link<> aLk = LINK( this, SwFormatTablePage, UpDownLoseFocusHdl );
     m_pTopMF->SetUpHdl( aLk );
     m_pBottomMF->SetUpHdl( aLk );
     m_aRightMF.SetUpHdl( aLk );
@@ -167,8 +167,9 @@ void  SwFormatTablePage::Init()
     m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl ));
 }
 
-IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
+IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void )
 {
+    CheckBox* pBtn = static_cast<CheckBox*>(p);
     OSL_ENSURE(pTableData, "table data not available?");
     bool bIsChecked = pBtn->IsChecked();
     sal_Int64 nLeft  = m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue(FUNIT_TWIP ));
@@ -199,11 +200,9 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
         m_pRightFT->Enable(bEnable);
     }
     bModified = true;
-
-    return 0;
 }
 
-IMPL_LINK( SwFormatTablePage, AutoClickHdl, void *, pControl )
+IMPL_LINK_TYPED( SwFormatTablePage, AutoClickHdl, Button*, pControl, void )
 {
     bool bRestore = true,
          bLeftEnable = false,
@@ -265,7 +264,6 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, void *, pControl )
     }
     ModifyHdl(m_aWidthMF.get());
     bModified = true;
-    return 0;
 }
 
 void SwFormatTablePage::RightModify()
@@ -858,7 +856,7 @@ void  SwTableColumnPage::Init(bool bWeb)
     }
     SetMetric(*m_pSpaceED, aMetric);
 
-    Link<> aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
+    Link<Button*,void> aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
     m_pUpBtn->SetClickHdl( aLk );
     m_pDownBtn->SetClickHdl( aLk );
 
@@ -867,7 +865,7 @@ void  SwTableColumnPage::Init(bool bWeb)
     m_pProportionalCB->SetClickHdl( aLk );
 }
 
-IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
+IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void )
 {
     //move display window
     if(pControl == m_pDownBtn.get())
@@ -902,7 +900,6 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
     m_pDownBtn->Enable(aValueTable[0] > 0);
     m_pUpBtn->Enable(aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
     UpdateCols(0);
-    return 0;
 }
 
 IMPL_LINK( SwTableColumnPage, UpHdl, MetricField*, pEdit )
@@ -929,16 +926,15 @@ IMPL_LINK( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
     return 0;
 }
 
-IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SwTableColumnPage, ModeHdl, Button*, pBox, void )
 {
-    bool bCheck = pBox->IsChecked();
+    bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked();
     if (pBox == m_pProportionalCB)
     {
         if(bCheck)
             m_pModifyTableCB->Check();
         m_pModifyTableCB->Enable(!bCheck && bModifyTable);
     }
-    return 0;
 }
 
 bool  SwTableColumnPage::FillItemSet( SfxItemSet* )
@@ -1692,7 +1688,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh)
     }
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void)
 {
     if( m_pPgBrkCB->IsChecked() )
     {
@@ -1727,10 +1723,9 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
             m_pPgBrkBeforeRB-> Enable(false);
             m_pPgBrkAfterRB->  Enable(false);
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void)
 {
     bool bEnable = false;
     if ( m_pPageCollCB->IsChecked() &&
@@ -1749,10 +1744,9 @@ IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl)
         m_pPageNoFT->Enable(bEnable);
         m_pPageNoNF->Enable(bEnable);
     }
-    return 0;
 }
 
-IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void )
 {
     if ( m_pPgBrkCB->IsChecked() )
     {
@@ -1779,10 +1773,9 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
             m_pPageNoNF->Enable(false);
         }
     }
-    return 0;
 }
 
-IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
+IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void )
 {
     if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() )
     {
@@ -1794,27 +1787,22 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
     }
     else if ( m_pPgBrkBeforeRB->IsChecked() )
         PageBreakPosHdl_Impl(m_pPgBrkBeforeRB);
-    return 0;
 }
 
-IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox )
+IMPL_LINK_TYPED( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void )
 {
-    m_pSplitRowCB->Enable(pBox->IsChecked());
-    return 0;
+    m_pSplitRowCB->Enable(static_cast<CheckBox*>(pBox)->IsChecked());
 }
 
-IMPL_STATIC_LINK(
-    SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox )
+IMPL_STATIC_LINK_TYPED(
+    SwTextFlowPage, SplitRowHdl_Impl, Button*, pBox, void )
 {
-    pBox->EnableTriState(false);
-    return 0;
+    static_cast<TriStateBox*>(pBox)->EnableTriState(false);
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl)
+IMPL_LINK_NOARG_TYPED(SwTextFlowPage, HeadLineCBClickHdl, Button*, void)
 {
     m_pRepeatHeaderCombo->Enable(m_pHeadLineCB->IsChecked());
-
-    return 0;
 }
 
 void SwTextFlowPage::DisablePageBreak()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 87123fde207a..4d9c25b3c572 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -207,7 +207,7 @@ void SwAutoFormatDlg::dispose()
 
 void SwAutoFormatDlg::Init( const SwTableAutoFormat* pSelFormat )
 {
-    Link<> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) );
+    Link<Button*,void> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) );
     m_pBtnBorder->SetClickHdl( aLk );
     m_pBtnFont->SetClickHdl( aLk );
     m_pBtnPattern->SetClickHdl( aLk );
@@ -277,7 +277,7 @@ void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const
 
 // Handler:
 
-IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
+IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void )
 {
     SwTableAutoFormat* pData  = &(*pTableTable)[nIndex];
     bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(), bDataChgd = true;
@@ -305,10 +305,9 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
 
         m_pWndPreview->NotifyChange( *pData );
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
+IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void)
 {
     bool bOk = false, bFormatInserted = false;
     while( !bOk )
@@ -363,10 +362,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
         else
             bOk = true;
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
+IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void)
 {
     OUString aMessage = aStrDelMsg;
     aMessage += "\n\n";
@@ -399,11 +397,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
     pBox.reset();
 
     SelFormatHdl( 0 );
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
+IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void)
 {
     bool bOk = false;
     while( !bOk )
@@ -463,7 +459,6 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
         else
             bOk = true;
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl)
@@ -500,12 +495,11 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
+IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, OkHdl, Button*, void)
 {
     if( bSetAutoFormat )
         pShell->SetTableAutoFormat( (*pTableTable)[ nIndex ] );
     EndDialog( RET_OK );
-    return sal_IntPtr(true);
 }
 
 AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) :