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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

10 files changed, 33 insertions, 51 deletions

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 6263190669aa..0886666bc541 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -44,7 +44,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
     get(m_pNextPB, "next");
     get(m_pEditPB, "edit");
 
-    Link<> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl);
+    Link<Button*,void> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl);
     m_pEditPB->SetClickHdl(aButtonLk);
     if( bNextButton )
     {
@@ -106,10 +106,9 @@ void sw::DropDownFieldDialog::Apply()
     }
 }
 
-IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, PushButton*, pButton)
+IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void)
 {
     EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES );
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index a5f61470f534..0ab326297cfe 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -217,7 +217,7 @@ void SwChangeDBDlg::UpdateFields()
     pSh->EndAllAction();
 }
 
-IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl)
+IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void)
 {
     OUString sTableName;
     OUString sColumnName;
@@ -229,8 +229,6 @@ IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl)
     pSh->ChgDBData(aData);
     ShowDBName(pSh->GetDBData());
     EndDialog(RET_OK);
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
@@ -261,12 +259,11 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
     }
 }
 
-IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl)
+IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, AddDBHdl, Button*, void)
 {
     const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
     if (!sNewDB.isEmpty())
         m_pAvailDBTLB->AddDataSource(sNewDB);
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 96ceb81cd274..f433a5e414ff 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -475,14 +475,13 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void)
 {
     OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
     if(!sNewDB.isEmpty())
     {
         m_pDatabaseTLB->AddDataSource(sNewDB);
     }
-    return 0;
 }
 
 // Modify
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 220d531d8b2d..b663cc4956ad 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -58,7 +58,7 @@ class SwFieldDBPage : public SwFieldPage
     DECL_LINK( NumSelectHdl, NumFormatListBox* );
     DECL_LINK( TreeSelectHdl, SvTreeListBox* );
     DECL_LINK(ModifyHdl, void *);
-    DECL_LINK(AddDBHdl, void *);
+    DECL_LINK_TYPED(AddDBHdl, Button*, void);
 
     void                CheckInsert();
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index e95edece3efc..91c2dcc4b272 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -240,7 +240,7 @@ void SwFieldEditDlg::InsertHdl()
 }
 
 // kick off changing of the field
-IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void)
 {
     if (GetOKButton()->IsEnabled())
     {
@@ -249,8 +249,6 @@ IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl)
             pTabPage->FillItemSet(0);
         EndDialog( RET_OK );
     }
-
-    return 0;
 }
 
 short SwFieldEditDlg::Execute()
@@ -260,7 +258,7 @@ short SwFieldEditDlg::Execute()
 }
 
 // Traveling between fields of the same type
-IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton )
+IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
 {
     bool bNext = pButton == m_pNextBT;
 
@@ -292,11 +290,9 @@ IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton )
     pTabPage->EditNewField();
 
     Init();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void)
 {
     SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage());
     SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
@@ -341,7 +337,6 @@ IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl)
     {
         pSh->UpdateFields( *pCurField );
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index dd4e8e64ce2f..f028af35d3b4 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -168,12 +168,12 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
     m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldFuncPage, InsertMacroHdl));
     m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldFuncPage, InsertHdl));
     m_pMacroBT->SetClickHdl            (LINK(this, SwFieldFuncPage, MacroHdl));
-    Link<> aListModifyLk( LINK(this, SwFieldFuncPage, ListModifyHdl));
+    Link<Button*,void> aListModifyLk( LINK(this, SwFieldFuncPage, ListModifyHdl));
     m_pListAddPB->SetClickHdl(aListModifyLk);
     m_pListRemovePB->SetClickHdl(aListModifyLk);
     m_pListUpPB->SetClickHdl(aListModifyLk);
     m_pListDownPB->SetClickHdl(aListModifyLk);
-    m_pListItemED->SetReturnActionLink(aListModifyLk);
+    m_pListItemED->SetReturnActionLink(LINK(this, SwFieldFuncPage, ListModifyReturnActionHdl));
     Link<> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl);
     m_pListItemED->SetModifyHdl(aListEnableLk);
     m_pListItemsLB->SetSelectHdl(aListEnableLk);
@@ -417,13 +417,17 @@ IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl)
 
 IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl)
 {
-    SelectHdl();
+    SelectHdl(NULL);
     InsertHdl();
 
     return 0;
 }
 
-IMPL_LINK( SwFieldFuncPage, ListModifyHdl, Control*, pControl)
+IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyHdl, Button*, pControl, void)
+{
+    ListModifyReturnActionHdl(pControl);
+}
+IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, Control*, pControl)
 {
     m_pListItemsLB->SetUpdateMode(false);
     if(pControl == m_pListAddPB ||
@@ -528,7 +532,7 @@ void SwFieldFuncPage::UpdateSubType()
 }
 
 // call MacroBrowser, fill Listbox with Macros
-IMPL_LINK( SwFieldFuncPage, MacroHdl, Button *, pBtn )
+IMPL_LINK_TYPED( SwFieldFuncPage, MacroHdl, Button *, pBtn, void )
 {
     vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( pBtn );
@@ -537,8 +541,6 @@ IMPL_LINK( SwFieldFuncPage, MacroHdl, Button *, pBtn )
         UpdateSubType();
 
     Application::SetDefDialogParent( pDefModalDlgParent );
-
-    return 0;
 }
 
 bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
@@ -599,7 +601,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
         InsertField( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
-    ModifyHdl();    // enable/disable Insert if applicable
+    ModifyHdl(NULL);    // enable/disable Insert if applicable
 
     return false;
 }
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 468f5fdf0bd8..bedaaa51c2f1 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -67,14 +67,15 @@ class SwFieldFuncPage : public SwFieldPage
     bool            bDropDownLBChanged;
 
     DECL_LINK(TypeHdl, void *);
-    DECL_LINK(SelectHdl, void * = 0);
+    DECL_LINK(SelectHdl, void *);
     DECL_LINK(InsertMacroHdl, void *);
-    DECL_LINK(ModifyHdl, void * = 0);
-    DECL_LINK( ListModifyHdl, Control*);
+    DECL_LINK(ModifyHdl, void *);
+    DECL_LINK(ListModifyReturnActionHdl, Control *);
+    DECL_LINK_TYPED( ListModifyHdl, Button*, void);
     DECL_LINK( ListEnableHdl, void*);
 
     // select Macro
-    DECL_LINK( MacroHdl, Button * );
+    DECL_LINK_TYPED( MacroHdl, Button *, void );
 
     void                UpdateSubType();
     static OUString     TurnMacroString(const OUString &rMacro);
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 06ddf5f9a973..87d9b1cb2157 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -180,7 +180,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID  )
 }
 
 // kick off inserting of new fields
-IMPL_LINK_NOARG(SwFieldDlg, OKHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void)
 {
     if (GetOKButton().IsEnabled())
     {
@@ -189,14 +189,11 @@ IMPL_LINK_NOARG(SwFieldDlg, OKHdl)
 
         GetOKButton().GrabFocus();  // because of InputField-Dlg
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwFieldDlg, CancelHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDlg, CancelHdl, Button*, void)
 {
     Close();
-    return 0;
 }
 
 // newly initialise dialog after Doc-Switch
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index c225195c8029..c261f584830a 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -164,10 +164,9 @@ void SwFieldInputDlg::Apply()
     rSh.EndAllAction();
 }
 
-IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldInputDlg, NextHdl, Button*, void)
 {
     EndDialog(RET_OK);
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index c193ba567edf..ef953516cedd 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -64,7 +64,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
     m_pNextBtn->SetClickHdl( LINK( this, SwJavaEditDialog, NextHdl ) );
     m_pOKBtn->SetClickHdl( LINK( this, SwJavaEditDialog, OKHdl ) );
 
-    Link<> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
+    Link<Button*,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
     m_pUrlRB->SetClickHdl(aLk);
     m_pEditRB->SetClickHdl(aLk);
     m_pUrlPB->SetClickHdl(LINK(this, SwJavaEditDialog, InsertFileHdl));
@@ -110,7 +110,7 @@ void SwJavaEditDialog::dispose()
     SvxStandardDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl)
+IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void)
 {
     pSh->EnterStdMode();
 
@@ -119,11 +119,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl)
     pField = static_cast<SwScriptField*>(pMgr->GetCurField());
     CheckTravel();
     RadioButtonHdl(NULL);
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
+IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void)
 {
     pSh->EnterStdMode();
 
@@ -132,15 +130,12 @@ IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
     pField = static_cast<SwScriptField*>(pMgr->GetCurField());
     CheckTravel();
     RadioButtonHdl(NULL);
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl)
+IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void)
 {
     SetField();
     EndDialog( RET_OK );
-    return 0;
 }
 
 void SwJavaEditDialog::Apply()
@@ -237,7 +232,7 @@ bool SwJavaEditDialog::IsUpdate() const
     return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText );
 }
 
-IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl)
+IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void)
 {
     bool bEnable = m_pUrlRB->IsChecked();
     m_pUrlPB->Enable(bEnable);
@@ -254,10 +249,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl)
         if( m_pUrlPB->IsEnabled() && !bEnable )
             m_pUrlPB->Enable( false );
     }
-    return 0;
 }
 
-IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn )
+IMPL_LINK_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, pBtn, void )
 {
     if ( !pFileDlg )
     {
@@ -270,7 +264,6 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn )
     }
 
     pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) );
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void)