convert Link<> to typed

Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

12 files changed, 66 insertions, 69 deletions

diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 8da28091d685..34db853ebcae 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -183,7 +183,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
     TypeHdl(0);
 
     m_pTypeLB->SetUpdateMode(true);
-    m_pTypeLB->SetSelectHdl(LINK(this, SwFieldDBPage, TypeHdl));
+    m_pTypeLB->SetSelectHdl(LINK(this, SwFieldDBPage, TypeListBoxHdl));
     m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, ListBoxInsertHdl));
 
     if (IsFieldEdit())
@@ -275,7 +275,12 @@ sal_uInt16 SwFieldDBPage::GetGroup()
     return GRP_DB;
 }
 
-IMPL_LINK( SwFieldDBPage, TypeHdl, ListBox *, pBox )
+IMPL_LINK_TYPED( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void )
+{
+    TypeHdl(&rBox);
+}
+
+void SwFieldDBPage::TypeHdl( ListBox* pBox )
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -393,16 +398,12 @@ IMPL_LINK( SwFieldDBPage, TypeHdl, ListBox *, pBox )
 
         CheckInsert();
     }
-
-    return 0;
 }
 
-IMPL_LINK( SwFieldDBPage, NumSelectHdl, NumFormatListBox *, pLB )
+IMPL_LINK_TYPED( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void )
 {
     m_pNewFormatRB->Check();
-    m_aOldNumSelectHdl.Call(pLB);
-
-    return 0;
+    m_aOldNumSelectHdl.Call(rLB);
 }
 
 void SwFieldDBPage::CheckInsert()
@@ -502,7 +503,7 @@ void SwFieldDBPage::ActivateMailMergeAddress()
 {
     sal_uLong nData = TYP_DBFLD;
     m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( reinterpret_cast<const void*>( nData ) ));
-    m_pTypeLB->GetSelectHdl().Call(m_pTypeLB);
+    m_pTypeLB->GetSelectHdl().Call(*m_pTypeLB);
     const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource();
     m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr);
 }
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index cc118696dc17..d6813766a735 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -52,13 +52,14 @@ class SwFieldDBPage : public SwFieldPage
     OUString            m_sOldColumnName;
     sal_uLong           m_nOldFormat;
     sal_uInt16          m_nOldSubType;
-    Link<>              m_aOldNumSelectHdl;
+    Link<ListBox&,void> m_aOldNumSelectHdl;
 
-    DECL_LINK( TypeHdl, ListBox* );
-    DECL_LINK( NumSelectHdl, NumFormatListBox* );
+    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);
+    void TypeHdl(ListBox*);
 
     void                CheckInsert();
 
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index a71fcb71964e..9b107f8137cf 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -235,10 +235,10 @@ IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
     else if (pOldEntry != pSelEntry)
         FillSelectionLB((sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()));
 
-    SubTypeHdl();
+    SubTypeHdl(*m_pSelectionLB);
 }
 
-IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
 {
     sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData());
     sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl)
                     }
                 }
                 else
-                    return 0;
+                    return;
             }
             nPos = 0;
         }
@@ -367,8 +367,6 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl)
     {
         m_pFormatLB->SelectEntryPos(0);
     }
-
-    return 0;
 }
 
 sal_Int32 SwFieldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index e4ebe9278d9b..dd89d2d6eaf7 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -51,7 +51,7 @@ class SwFieldDokInfPage : public SwFieldPage
     OUString     m_sOldCustomFieldName;
 
     DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void);
-    DECL_LINK(SubTypeHdl, void * = 0);
+    DECL_LINK_TYPED(SubTypeHdl, ListBox&, void);
 
     sal_Int32               FillSelectionLB(sal_uInt16 nSubTypeId);
 
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 424152214e11..00d91dc60038 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -192,7 +192,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
             }
         }
     }
-    TypeHdl(0);
+    TypeHdl(*m_pTypeLB);
 
     if (IsFieldEdit())
     {
@@ -205,7 +205,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl)
                     }
                 }
             }
-            m_pSelectionLB->SetSelectHdl(Link<>());
+            m_pSelectionLB->SetSelectHdl(Link<ListBox&,void>());
         }
         else
         {
@@ -450,8 +450,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl)
         m_pValueFT->Enable(bValue || bLevel || bOffset);
         m_pValueED->Enable(bValue);
     }
-
-    return 0;
 }
 
 void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId)
@@ -460,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId)
     m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
 }
 
-IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDokPage, SubTypeHdl, ListBox&, void)
 {
     sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
     if(nPos == LISTBOX_ENTRY_NOTFOUND)
@@ -490,8 +488,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl)
 
     if( nTextRes )
         m_pValueFT->SetText( SW_RESSTR( nTextRes ));
-
-    return 0;
 }
 
 sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
@@ -524,12 +520,12 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
         }
     }
 
-    FormatHdl();
+    FormatHdl(*m_pFormatLB);
 
     return nSize;
 }
 
-IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDokPage, FormatHdl, ListBox&, void)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -557,8 +553,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl)
         if (sOldText != m_pValueFT->GetText())
             m_pValueED->SetText( aEmptyOUStr );
     }
-
-    return 0;
 }
 
 bool SwFieldDokPage::FillItemSet(SfxItemSet* )
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index d3035ea5e969..bef27f832d80 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -50,9 +50,9 @@ class SwFieldDokPage : public SwFieldPage
     sal_Int32               nOldSel;
     sal_uLong               nOldFormat;
 
-    DECL_LINK(TypeHdl, void *);
-    DECL_LINK(FormatHdl, void * = 0);
-    DECL_LINK(SubTypeHdl, void *);
+    DECL_LINK_TYPED(TypeHdl, ListBox&, void);
+    DECL_LINK_TYPED(FormatHdl, ListBox&, void);
+    DECL_LINK_TYPED(SubTypeHdl, ListBox&, void);
 
     void                AddSubType(sal_uInt16 nTypeId);
     sal_Int32           FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 8836017ad010..31aae8eb3b05 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -176,7 +176,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
     m_pListItemED->SetReturnActionLink(LINK(this, SwFieldFuncPage, ListModifyReturnActionHdl));
     Link<> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl);
     m_pListItemED->SetModifyHdl(aListEnableLk);
-    m_pListItemsLB->SetSelectHdl(aListEnableLk);
+    m_pListItemsLB->SetSelectHdl(LINK(this, SwFieldFuncPage, ListEnableListBoxHdl));
 
     if( !IsRefresh() )
     {
@@ -196,7 +196,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
             }
         }
     }
-    TypeHdl(0);
+    TypeHdl(*m_pTypeLB);
 
     m_pTypeLB->SetUpdateMode(true);
 
@@ -210,7 +210,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -401,23 +401,19 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl)
 
         EnableInsert( bInsert );
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void)
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
     if( TYP_MACROFLD == nTypeId )
         m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() );
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, InsertMacroHdl, ListBox&, void)
 {
-    SelectHdl(NULL);
+    SelectHdl(*m_pSelectionLB);
     InsertHdl(nullptr);
 }
 
@@ -475,6 +471,10 @@ void SwFieldFuncPage::ListModifyHdl(Control* pControl)
     ListEnableHdl(0);
 }
 
+IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void)
+{
+    ListEnableHdl(0);
+}
 IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl)
 {
     //enable "Add" button when text is in the Edit that's not already member of the box
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 238bf9b659e1..bd5abd35e63a 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -66,13 +66,14 @@ class SwFieldFuncPage : public SwFieldPage
     sal_uLong           nOldFormat;
     bool            bDropDownLBChanged;
 
-    DECL_LINK(TypeHdl, void *);
-    DECL_LINK(SelectHdl, void *);
+    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);
     void ListModifyHdl(Control*);
 
     // select Macro
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 252cf9ba58cb..1c0bd9f74222 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -93,7 +93,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet
 
     m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFieldRefPage, ListBoxInsertHdl));
     m_pTypeLB->SetSelectHdl            (LINK(this, SwFieldRefPage, TypeHdl));
-    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldRefPage, SubTypeHdl));
+    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldRefPage, SubTypeListBoxHdl));
     m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldRefPage, ListBoxInsertHdl));
     m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldRefPage, ListBoxInsertHdl));
 
@@ -264,7 +264,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
             }
         }
     }
-    TypeHdl(0);
+    TypeHdl(*m_pTypeLB);
 
     if (IsFieldEdit())
     {
@@ -276,7 +276,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -407,18 +407,20 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl)
         bool bFormat = nSize != 0;
         m_pFormat->Enable(bFormat);
 
-        SubTypeHdl(NULL);
+        SubTypeHdl();
         ModifyHdl(NULL);
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void)
 {
-    SubTypeHdl(NULL);
+    SubTypeHdl();
+}
+IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void)
+{
+    SubTypeHdl();
 }
-IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl)
+void SwFieldRefPage::SubTypeHdl()
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -461,8 +463,6 @@ IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl)
                 m_pNameED->SetText(m_pSelectionLB->GetSelectEntry());
             break;
     }
-
-    return 0;
 }
 
 // renew types in SelectionLB
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 24e5944d6b1b..3e63c48b8f25 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -60,10 +60,11 @@ class SwFieldRefPage : public SwFieldPage
     // fallback, if previously selected text node doesn't exist anymore
     size_t mnSavedSelectedPos;
 
-    DECL_LINK(TypeHdl, void *);
-    DECL_LINK(SubTypeHdl, void * = 0);
+    DECL_LINK_TYPED(TypeHdl, ListBox&, void);
+    DECL_LINK_TYPED(SubTypeListBoxHdl, ListBox&, void);
     DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void);
     DECL_LINK(ModifyHdl, void * = 0);
+    void SubTypeHdl();
 
     void                UpdateSubType();
     sal_Int32               FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 5b65c8cb9cc1..b1366fbbefdb 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -162,7 +162,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
 
     m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFieldVarPage, ListBoxInsertHdl));
     m_pTypeLB->SetSelectHdl            (LINK(this, SwFieldVarPage, TypeHdl));
-    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldVarPage, SubTypeHdl));
+    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldVarPage, SubTypeListBoxHdl));
     m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldVarPage, ListBoxInsertHdl));
     m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldVarPage, ListBoxInsertHdl));
     m_pNumFormatLB->SetDoubleClickHdl  (LINK(this, SwFieldVarPage, ListBoxInsertHdl));
@@ -190,7 +190,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
             }
         }
     }
-    TypeHdl(0);
+    TypeHdl(*m_pTypeLB);
 
     m_pTypeLB->SetUpdateMode(true);
 
@@ -207,7 +207,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -235,11 +235,14 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl)
     }
 
     bInit = false;
+}
 
-    return 0;
+IMPL_LINK_TYPED( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void )
+{
+    SubTypeHdl(&rBox);
 }
 
-IMPL_LINK( SwFieldVarPage, SubTypeHdl, ListBox *, pBox )
+void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
     sal_Int32 nSelPos = m_pSelectionLB->GetSelectEntryPos();
@@ -514,7 +517,7 @@ IMPL_LINK( SwFieldVarPage, SubTypeHdl, ListBox *, pBox )
                         m_pChapterLevelLB->SelectEntryPos( nLevel + 1 );
                     OUString sDelim = static_cast<SwSetExpFieldType*>(pFieldTyp)->GetDelimiter();
                     m_pSeparatorED->SetText( sDelim );
-                    ChapterHdl();
+                    ChapterHdl(*m_pChapterLevelLB);
                 }
             }
             break;
@@ -587,7 +590,6 @@ IMPL_LINK( SwFieldVarPage, SubTypeHdl, ListBox *, pBox )
         }
         m_pSelectionLB->ResetCallAddSelection();
     }
-    return 0;
 }
 
 // renew types in SelectionBox
@@ -1098,15 +1100,13 @@ IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void)
 {
     bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
 
     m_pSeparatorED->Enable(bEnable);
     m_pSeparatorFT->Enable(bEnable);
     SeparatorHdl();
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl)
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 6292a5d6210d..d4b9ea176a84 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -76,12 +76,13 @@ class SwFieldVarPage : public SwFieldPage
     sal_uLong           nOldFormat;
     bool                bInit;
 
-    DECL_LINK(TypeHdl, void *);
-    DECL_LINK( SubTypeHdl, ListBox* );
+    DECL_LINK_TYPED(TypeHdl, ListBox&, void);
+    DECL_LINK_TYPED( SubTypeListBoxHdl, ListBox&, void );
     DECL_LINK(ModifyHdl, void * = 0);
     DECL_LINK_TYPED( TBClickHdl, ToolBox *, void );
-    DECL_LINK(ChapterHdl, void * = 0);
+    DECL_LINK_TYPED(ChapterHdl, ListBox&, void);
     DECL_LINK(SeparatorHdl, void * = 0);
+    void SubTypeHdl(ListBox*);
 
     void                UpdateSubType();
     sal_Int32           FillFormatLB(sal_uInt16 nTypeId);