convert Link<> to typed

Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 32 insertions, 43 deletions

diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 34db853ebcae..3e0c7620ccab 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -485,10 +485,9 @@ IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDBPage, ModifyHdl, Edit&, void)
 {
     CheckInsert();
-    return 0;
 }
 
 void    SwFieldDBPage::FillUserData()
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 5a5a8fc2b1e4..6fcf77ef559e 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -57,8 +57,8 @@ class SwFieldDBPage : public SwFieldPage
     DECL_LINK_TYPED( TypeListBoxHdl, ListBox&, void );
     DECL_LINK_TYPED( NumSelectHdl, ListBox&, void );
     DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void );
-    DECL_LINK(ModifyHdl, void *);
-    DECL_LINK_TYPED(AddDBHdl, Button*, void);
+    DECL_LINK_TYPED( ModifyHdl, Edit&, void );
+    DECL_LINK_TYPED( AddDBHdl, Button*, void );
     void TypeHdl(ListBox*);
 
     void                CheckInsert();
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 31aae8eb3b05..aa8c6e9523b8 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -174,7 +174,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
     m_pListUpPB->SetClickHdl(aListModifyLk);
     m_pListDownPB->SetClickHdl(aListModifyLk);
     m_pListItemED->SetReturnActionLink(LINK(this, SwFieldFuncPage, ListModifyReturnActionHdl));
-    Link<> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl);
+    Link<Edit&,void> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl);
     m_pListItemED->SetModifyHdl(aListEnableLk);
     m_pListItemsLB->SetSelectHdl(LINK(this, SwFieldFuncPage, ListEnableListBoxHdl));
 
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void)
             m_pValueED->SetText(OUString());
         }
         if(bDropDown)
-            ListEnableHdl(0);
+            ListEnableHdl(*m_pListItemED);
 
         if (m_pNameFT->GetText() != m_sOldNameFT)
             m_pNameFT->SetText(m_sOldNameFT);
@@ -468,14 +468,14 @@ void SwFieldFuncPage::ListModifyHdl(Control* pControl)
     }
     bDropDownLBChanged = true;
     m_pListItemsLB->SetUpdateMode(true);
-    ListEnableHdl(0);
+    ListEnableHdl(*m_pListItemED);
 }
 
 IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void)
 {
-    ListEnableHdl(0);
+    ListEnableHdl(*m_pListItemED);
 }
-IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableHdl, Edit&, void)
 {
     //enable "Add" button when text is in the Edit that's not already member of the box
     m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() &&
@@ -485,8 +485,6 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl)
     m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectEntryPos() > 0));
     m_pListDownPB->Enable(bEnableButtons &&
                 (m_pListItemsLB->GetSelectEntryPos() < (m_pListItemsLB->GetEntryCount() - 1)));
-
-    return 0;
 }
 
 // renew types in SelectionBox
@@ -602,7 +600,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
         InsertField( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
-    ModifyHdl(NULL);    // enable/disable Insert if applicable
+    ModifyHdl(*m_pNameED);    // enable/disable Insert if applicable
 
     return false;
 }
@@ -652,7 +650,7 @@ void    SwFieldFuncPage::FillUserData()
     SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
 }
 
-IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ModifyHdl, Edit&, void)
 {
     const sal_Int32 nLen = m_pNameED->GetText().getLength();
 
@@ -664,8 +662,6 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl)
         bEnable = false;
 
     EnableInsert( bEnable );
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 96ce837c8f98..7effcb4d0929 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -66,14 +66,14 @@ class SwFieldFuncPage : public SwFieldPage
     sal_uLong           nOldFormat;
     bool            bDropDownLBChanged;
 
-    DECL_LINK_TYPED(TypeHdl, ListBox&, void);
-    DECL_LINK_TYPED(SelectHdl, ListBox&, void);
-    DECL_LINK_TYPED(InsertMacroHdl, ListBox&, void);
-    DECL_LINK(ModifyHdl, void *);
-    DECL_LINK_TYPED(ListModifyReturnActionHdl, ReturnActionEdit&, void);
-    DECL_LINK_TYPED(ListModifyButtonHdl, Button*, void);
-    DECL_LINK( ListEnableHdl, void*);
-    DECL_LINK_TYPED( ListEnableListBoxHdl, ListBox&, void);
+    DECL_LINK_TYPED( TypeHdl, ListBox&, void );
+    DECL_LINK_TYPED( SelectHdl, ListBox&, void );
+    DECL_LINK_TYPED( InsertMacroHdl, ListBox&, void );
+    DECL_LINK_TYPED( ModifyHdl, Edit&, void );
+    DECL_LINK_TYPED( ListModifyReturnActionHdl, ReturnActionEdit&, void );
+    DECL_LINK_TYPED( ListModifyButtonHdl, Button*, void );
+    DECL_LINK_TYPED( ListEnableHdl, Edit&, void );
+    DECL_LINK_TYPED( ListEnableListBoxHdl, ListBox&, void );
     void ListModifyHdl(Control*);
 
     // select Macro
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 1c0bd9f74222..4b38523b2d73 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void)
         m_pFormat->Enable(bFormat);
 
         SubTypeHdl();
-        ModifyHdl(NULL);
+        ModifyHdl(*m_pNameED);
     }
 }
 
@@ -430,7 +430,7 @@ void SwFieldRefPage::SubTypeHdl()
             if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount())
             {
                 m_pNameED->SetText(m_pSelectionLB->GetSelectEntry());
-                ModifyHdl(m_pNameED);
+                ModifyHdl(*m_pNameED);
             }
             break;
 
@@ -758,7 +758,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl, Edit&, void)
 {
     OUString aName(m_pNameED->GetText());
     const bool bEmptyName = aName.isEmpty();
@@ -774,8 +774,6 @@ IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl)
     EnableInsert(bEnable);
 
     m_pSelectionLB->SelectEntry(aName);
-
-    return 0;
 }
 
 bool SwFieldRefPage::FillItemSet(SfxItemSet* )
@@ -954,7 +952,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
         InsertField( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
-    ModifyHdl();    // enable/disable insert if applicable
+    ModifyHdl(*m_pNameED);    // enable/disable insert if applicable
 
     return false;
 }
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index d59d872758c7..f06f114d6585 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -63,7 +63,7 @@ class SwFieldRefPage : public SwFieldPage
     DECL_LINK_TYPED(TypeHdl, ListBox&, void);
     DECL_LINK_TYPED(SubTypeListBoxHdl, ListBox&, void);
     DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void);
-    DECL_LINK(ModifyHdl, void * = 0);
+    DECL_LINK_TYPED(ModifyHdl, Edit&, void);
     void SubTypeHdl();
 
     void                UpdateSubType();
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index b1366fbbefdb..3dcbf74e2cb6 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -561,7 +561,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
     m_pChapterFrame->Show(bShowChapterFrame);
     m_pInvisibleCB->Enable(bInvisible);
 
-    ModifyHdl();    // apply/insert/delete status update
+    ModifyHdl(*m_pNameED);    // apply/insert/delete status update
 
     m_pNumFormatLB->SetUpdateMode(true);
     m_pFormatLB->SetUpdateMode(true);
@@ -582,7 +582,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
                         if (nSelData != SIZE_MAX && pBox && !bInit)
                         {
                             m_pValueED->ReplaceSelected(m_pSelectionLB->GetSelectEntry());
-                            ModifyHdl();
+                            ModifyHdl(*m_pNameED);
                         }
                     }
                 }
@@ -831,7 +831,7 @@ sal_Int32 SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void)
 {
     OUString sValue(m_pValueED->GetText());
     bool bHasValue = !sValue.isEmpty();
@@ -952,8 +952,6 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl)
     m_pNewDelTBX->EnableItem(m_nApplyId, bApply);
     m_pNewDelTBX->EnableItem(m_nDeleteId, bDelete);
     EnableInsert(bInsert);
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
@@ -1106,16 +1104,14 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void)
 
     m_pSeparatorED->Enable(bEnable);
     m_pSeparatorFT->Enable(bEnable);
-    SeparatorHdl();
+    SeparatorHdl(*m_pSeparatorED);
 }
 
-IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldVarPage, SeparatorHdl, Edit&, void)
 {
     bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
                     m_pChapterLevelLB->GetSelectEntryPos() == 0;
     EnableInsert(bEnable);
-
-    return 0;
 }
 
 bool SwFieldVarPage::FillItemSet(SfxItemSet* )
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 435fef91c259..853edf348e74 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -76,12 +76,12 @@ class SwFieldVarPage : public SwFieldPage
     sal_uLong           nOldFormat;
     bool                bInit;
 
-    DECL_LINK_TYPED(TypeHdl, ListBox&, void);
+    DECL_LINK_TYPED( TypeHdl, ListBox&, void );
     DECL_LINK_TYPED( SubTypeListBoxHdl, ListBox&, void );
-    DECL_LINK(ModifyHdl, void * = 0);
+    DECL_LINK_TYPED( ModifyHdl, Edit&, void );
     DECL_LINK_TYPED( TBClickHdl, ToolBox *, void );
-    DECL_LINK_TYPED(ChapterHdl, ListBox&, void);
-    DECL_LINK(SeparatorHdl, void * = 0);
+    DECL_LINK_TYPED( ChapterHdl, ListBox&, void );
+    DECL_LINK_TYPED( SeparatorHdl, Edit&, void );
     void SubTypeHdl(ListBox*);
 
     void                UpdateSubType();