convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

44 files changed, 99 insertions, 129 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 5633b8505db7..7bfc2990a2aa 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1088,7 +1088,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void)
     sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
     m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
 
-    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox );
 }
 
 IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void)
@@ -1102,10 +1102,10 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void)
     m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
     (pEntry->m_sCommand).clear();
 
-    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox );
 }
 
-IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
+IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void )
 {
     // disable help
     Help::ShowBalloon( this, Point(), OUString() );
@@ -1189,8 +1189,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
             m_pEntriesBox->MakeVisible( pE3 );
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void)
@@ -1222,7 +1220,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void)
     if ( pEntry )
         m_pGroupLBox->Select( pEntry );
 
-    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox );
 }
 
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a0924cecdb2f..d6654a8e0356 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2272,13 +2272,9 @@ void SvxMenuConfigPage::dispose()
     SvxConfigPage::dispose();
 }
 
-IMPL_LINK( SvxMenuConfigPage, SelectMenuEntry, Control *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void )
 {
-    (void)pBox;
-
     UpdateButtonStates();
-
-    return 1;
 }
 
 void SvxMenuConfigPage::UpdateButtonStates()
@@ -2710,11 +2706,9 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
     return 0;
 }
 
-IMPL_LINK( SvxMainMenuOrganizerDialog, SelectHdl, Control*, pCtrl )
+IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void )
 {
-    (void)pCtrl;
     UpdateButtonStates();
-    return 1;
 }
 
 void SvxMainMenuOrganizerDialog::UpdateButtonStates()
@@ -4268,11 +4262,9 @@ bool ToolbarSaveInData::LoadToolbar(
     return true;
 }
 
-IMPL_LINK( SvxToolbarConfigPage, SelectToolbarEntry, Control *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void )
 {
-    (void)pBox;
     UpdateButtonStates();
-    return 1;
 }
 
 void SvxToolbarConfigPage::UpdateButtonStates()
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 92008bb39f10..1807da6ce0f9 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -572,21 +572,20 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
 }
 
 // select event handler on the listbox
-IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
+IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
 {
     SvHeaderTabListBox&        rListBox = mpImpl->pEventLB->GetListBox();
-    SvTreeListEntry*            pE = rListBox.FirstSelected();
-    sal_uLong                    nPos;
+    SvTreeListEntry*           pE = rListBox.FirstSelected();
+    sal_uLong                  nPos;
 
     if( !pE || LISTBOX_ENTRY_NOTFOUND ==
         ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
     {
         DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" );
-        return 0;
+        return;
     }
 
     EnableButtons();
-    return 0;
 }
 
 IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void )
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3aacad8f595a..0a4c29b944bf 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -936,7 +936,7 @@ void SvxScriptSelectorDialog::dispose()
     ModelessDialog::dispose();
 }
 
-IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl )
+IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void )
 {
     if (pCtrl == m_pCategories)
     {
@@ -947,7 +947,6 @@ IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl )
         m_pCommands->FunctionSelected();
     }
     UpdateUI();
-    return 0;
 }
 
 IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl )
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 789c3fa235c5..5144fddf3794 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1015,14 +1015,12 @@ namespace svx
         EndDialog( RET_OK );
     }
 
-    IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl)
+    IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void)
     {
         bool bSel = m_pDictsLB->FirstSelected() != NULL;
 
         m_pEditPB->Enable(bSel);
         m_pDeletePB->Enable(bSel);
-
-        return 0;
     }
 
     IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index d59c11587c57..685f9de6a061 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -164,7 +164,7 @@ void SvBaseLinksDlg::dispose()
 /*************************************************************************
 |*    SvBaseLinksDlg::Handler()
 *************************************************************************/
-IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
+IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void )
 {
     sal_uLong nSelectionCount = pSvTabListBox ?
         pSvTabListBox->GetSelectionCount() : 0;
@@ -212,7 +212,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
         sal_uLong nPos;
         SvBaseLink* pLink = GetSelEntry( &nPos );
         if( !pLink )
-            return 0;
+            return;
 
         m_pPbUpdateNow->Enable();
 
@@ -245,7 +245,6 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
         m_pFtFullSourceName->SetText( sLink );
         m_pFtFullTypeName->SetText( sType );
     }
-    return 0;
 }
 
 IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 446d5d78a688..2a66dae2a47d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -41,13 +41,12 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
-IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
 {
     sal_uLong nCount = m_pRadioLB->GetEntryCount();
     bool bIsSelected = m_pRadioLB->FirstSelected() != NULL;
     bool bEnable = nCount > 1;
     m_pDelBtn->Enable(bEnable && bIsSelected);
-    return 0;
 }
 
 IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl)
@@ -59,13 +58,14 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl)
     return 0;
 }
 
-IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox )
+IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void )
 {
     SvTreeListEntry* pEntry =
-        pBox ? pBox->GetEntry( pBox->GetCurMousePoint() ) : m_pRadioLB->FirstSelected();
+        pBox
+        ? pBox->GetEntry( static_cast<svx::SvxRadioButtonListBox*>(pBox)->GetCurMousePoint() )
+        : m_pRadioLB->FirstSelected();
     if ( pEntry )
         m_pRadioLB->HandleEntryChecked( pEntry );
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 734fae986b07..f689b51618ad 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -508,7 +508,7 @@ SvxScriptOrgDialog::~SvxScriptOrgDialog()
 void SvxScriptOrgDialog::dispose()
 {
     // clear the SelectHdl so that it isn't called during the dtor
-    m_pScriptsBox->SetSelectHdl( Link<>() );
+    m_pScriptsBox->SetSelectHdl( Link<SvTreeListBox*,void>() );
     m_pScriptsBox.clear();
     m_pRunButton.clear();
     m_pCloseButton.clear();
@@ -624,11 +624,11 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
     }
 }
 
-IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void )
 {
     if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
     {
-        return 0;
+        return;
     }
 
     SvTreeListEntry* pEntry = pBox->GetHdlEntry();
@@ -636,7 +636,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
     SFEntry* userData = 0;
     if ( !pEntry )
     {
-        return 0;
+        return;
     }
     userData = static_cast<SFEntry*>(pEntry->GetUserData());
 
@@ -646,8 +646,6 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
               node = userData->GetNode();
         CheckButtons( node );
     }
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void )
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 5dcf4e3281c9..697a8ebbe532 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -396,7 +396,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void )
 {
     SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
     if (pEntry)
@@ -410,7 +410,6 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB
         }
         m_pReplaceEdit->SetText( aStr );
     }
-    return 0;
 }
 
 IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox )
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ba7fc27e559f..df4b62dcd42a 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -149,7 +149,7 @@ private:
 
     DECL_LINK_TYPED(ChangeHdl, Button *, void);
     DECL_LINK_TYPED(RemoveHdl, Button *, void);
-    DECL_LINK(                  SelectHdl, Control * );
+    DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED(Save, Button *, void);
     DECL_LINK_TYPED(Load, Button *, void);
     DECL_LINK_TYPED(Default, Button *, void);
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 2261a5824cfa..1ad068dcf41b 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -160,7 +160,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 
     SvLBoxButtonData*   pCheckButtonData;
 
-        DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
+        DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
         DECL_LINK_TYPED(EditHdl, Button*, void);
         DECL_LINK(DoubleClickEditHdl, void*);
         SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
@@ -252,7 +252,7 @@ private:
         bool bReplaceEditChanged:1;
         bool bSWriter:1;
 
-        DECL_LINK(SelectHdl, SvTabListBox*);
+        DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
         DECL_LINK_TYPED(NewDelHdl, Button*, void);
         DECL_LINK(NewDelActionHdl, PushButton*);
         DECL_LINK(ModifyHdl, Edit*);
@@ -506,7 +506,7 @@ private:
         Enables/disables the properties push button if selection in the
         smart tag types list box changes.
     */
-    DECL_LINK(SelectHdl, void *);
+    DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
 
 public:
     /// construction via Create()
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index f73b6349e14b..e036f1c5cb46 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -441,7 +441,7 @@ class SvxMenuConfigPage : public SvxConfigPage
 private:
 
     DECL_LINK( SelectMenu, ListBox * );
-    DECL_LINK( SelectMenuEntry, Control * );
+    DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void );
     DECL_LINK_TYPED( NewMenuHdl, Button *, void );
     DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
     DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
@@ -484,7 +484,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
 
     DECL_LINK_TYPED( MoveHdl, Button *, void );
     DECL_LINK( ModifyHdl, Edit * );
-    DECL_LINK( SelectHdl, Control* );
+    DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
 
 public:
     SvxMainMenuOrganizerDialog (
@@ -533,7 +533,7 @@ class SvxToolbarConfigPage : public SvxConfigPage
 private:
 
     DECL_LINK( SelectToolbar, ListBox * );
-    DECL_LINK( SelectToolbarEntry, Control * );
+    DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void );
     DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void );
     DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
     DECL_LINK_TYPED( NewToolbarHdl, Button *, void );
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 879b6cd765eb..23d4bc638ed9 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -57,7 +57,7 @@ namespace svx
         DECL_LINK_TYPED( DeleteHdl, Button*, void );
         DECL_LINK(PathBoxDoubleClickHdl, void *);
 
-        DECL_LINK(PathSelect_Impl, void *);
+        DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void);
 
         DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
         DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index ca8fadfd0a2a..5598a59d4773 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -211,7 +211,7 @@ namespace svx
         css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList;
 
         DECL_LINK_TYPED( OkHdl, Button*, void );
-        DECL_LINK( DictsLB_SelectHdl, void* );
+        DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void );
         DECL_LINK_TYPED( NewDictHdl, Button*, void );
         DECL_LINK_TYPED( EditDictHdl, Button*, void );
         DECL_LINK_TYPED( DeleteDictHdl, Button*, void );
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 9af5b0dacb01..beffb1cadf5a 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -64,7 +64,7 @@ class SvBaseLinksDlg : public ModalDialog
     bool            bHtmlMode;
     Idle aUpdateIdle;
 
-    DECL_LINK( LinksSelectHdl, SvTabListBox * );
+    DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void );
     DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
     DECL_LINK_TYPED( AutomaticClickHdl, Button *, void );
     DECL_LINK_TYPED( ManualClickHdl, Button *, void );
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 3fb037e5f0cb..5d99c58149d6 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -29,15 +29,15 @@
 
 class _SfxMacroTabPage;
 class SvTabListBox;
-
+class SvTreeListBox;
 class _SfxMacroTabPage_Impl;
 
 class _SfxMacroTabPage : public SfxTabPage
 {
     SvxMacroTableDtor           aTbl;
-    DECL_DLLPRIVATE_LINK( SelectEvent_Impl, SvTabListBox * );
-    DECL_DLLPRIVATE_LINK( SelectGroup_Impl, ListBox * );
-    DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * );
+    DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void );
 
     DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * );
     DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void );
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index de7d4a70825d..bf19996bbd99 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -33,6 +33,8 @@
 #include <unordered_map>
 #include <vector>
 
+class SvTreeListBox;
+
 typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
                             OUStringHash, std::equal_to< OUString > > EventsHash;
 
@@ -57,7 +59,7 @@ class _SvxMacroTabPage_Impl;
 
 class _SvxMacroTabPage : public SfxTabPage
 {
-    DECL_LINK( SelectEvent_Impl, SvTabListBox * );
+    DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
     DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void );
     DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * );
 
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 566974177943..5415fb23a0ad 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -45,8 +45,8 @@ private:
 
     DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
     DECL_LINK_TYPED(DelHdl_Impl, Button*, void);
-    DECL_LINK(SelectHdl_Impl, void *);
-    DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*);
+    DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void);
+    DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void);
 
 public:
     SvxMultiPathDialog(vcl::Window* pParent);
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index f2a72c1d7088..87a8e1ddd2ce 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -154,6 +154,7 @@ private:
     DECL_LINK( LostFocusHdl_Impl, Edit* );
     DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* );
     DECL_LINK( SelFormatHdl_Impl, void * );
+    DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void );
     DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void );
     DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
     DECL_LINK( EditHdl_Impl, Edit* );
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index b8028ca9146a..17226165297d 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -131,7 +131,7 @@ private:
 
     DECL_LINK(SelectBookHdl_Impl, void *);
     DECL_LINK(SelectLangHdl_Impl, void *);
-    DECL_LINK(SelectHdl, SvTabListBox*);
+    DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
     DECL_LINK_TYPED(NewDelHdl, Button*, void);
     DECL_LINK(NewDelActionHdl, PushButton*);
     DECL_LINK(ModifyHdl, Edit*);
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 36ae80a2d074..d3768a44f0d6 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -74,13 +74,13 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvTreeListEntry*    CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
-    DECL_LINK(SelectHdl_Impl, SvxCheckListBox *);
+    DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void);
     DECL_LINK_TYPED(ClickHdl_Impl, Button*, void);
     DECL_LINK_TYPED(BackHdl_Impl, Button*, void);
     DECL_LINK( LangSelectHdl_Impl, ListBox* );
     DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void );
-    DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
+    DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
     DECL_LINK(OpenURLHdl_Impl, void *);
 
 public:
@@ -137,12 +137,12 @@ private:
     void    AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
     static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
 
-    DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
+    DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void );
     DECL_LINK_TYPED( ClickHdl_Impl, Button *, void );
     DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * );
-    DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
-    DECL_LINK_TYPED(PostDblClickHdl_Impl, void *, void);
-    DECL_LINK(OpenURLHdl_Impl, void *);
+    DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
+    DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void);
+    DECL_LINK( OpenURLHdl_Impl, void *);
 
     void                UpdateModulesBox_Impl();
     void                UpdateDicBox_Impl();
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 384a89ec0e97..fcce075ea686 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -57,7 +57,7 @@ private:
     DECL_LINK(DoubleClickPathHdl_Impl, void *);
     DECL_LINK_TYPED( StandardHdl_Impl, Button*, void);
 
-    DECL_LINK(PathSelect_Impl, void *);
+    DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
     DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
 
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 9224bb6d2494..1d77c270571a 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -156,7 +156,7 @@ protected:
     const OUString m_renameDupStr;
     const OUString m_renameErrTitleStr;
 
-    DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
+    DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void );
     DECL_LINK_TYPED( ButtonHdl, Button *, void );
     static bool         getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName );
     void                CheckButtons(  css::uno::Reference< css::script::browse::XBrowseNode >& node );
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index ff7e5f21a731..c88e47286747 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -185,7 +185,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
     Link<>                          m_aAddHdl;
 
     DECL_LINK_TYPED( ClickHdl, Button *, void );
-    DECL_LINK( SelectHdl, Control* );
+    DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
     DECL_LINK( FunctionDoubleClickHdl, Control* );
 
     void                            UpdateUI();
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index af209a197a7d..2a6b5c5ce245 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -146,7 +146,7 @@ public:
     DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void );
     DECL_LINK( LanguageHdl_Impl, ListBox * );
     DECL_LINK( WordSelectHdl_Impl, ComboBox * );
-    DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * );
+    DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void );
     DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * );
 
     DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 08a7d2fb1b7e..a1c7a363a052 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -183,8 +183,8 @@ private:
     void            InsertNodes( const VectorOfNodes& rNodeList );
 
 protected:
-    DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* );
-    DECL_LINK(ShowPageHdl_Impl, void *);
+    DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void );
+    DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED(BackHdl_Impl, Button*, void);
     DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
     void SelectHdl_Impl();
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index e0e6866e18e1..08be91f1fb71 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -161,13 +161,12 @@ void CertPathDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvSimpleTable *, pList )
+IMPL_LINK_TYPED( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void )
 {
     SvTreeListEntry* pEntry = pList ? m_pCertPathList->GetEntry(m_pCertPathList->GetCurMousePoint())
                                 : m_pCertPathList->FirstSelected();
     if (pEntry)
         m_pCertPathList->HandleEntryChecked(pEntry);
-    return 0;
 }
 
 void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry )
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 510c1529efc2..4136f3b89f01 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -26,7 +26,7 @@ private:
     OUString    m_sAddDialogText;
     OUString    m_sManual;
 
-    DECL_LINK(CheckHdl_Impl, SvSimpleTable *);
+    DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
     DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index c3e7ccdcc8d3..eec02b8bd7b3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -376,7 +376,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar
 }
 
 
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
 
@@ -389,7 +389,6 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
 
     m_pEdit->Enable( !bReadOnly );
     m_pDelete->Enable( !bReadOnly );
-    return 0;
 }
 
 void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 3d5c9f978c3d..1967ab3ed09c 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -91,7 +91,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
     Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
     Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
 
-    m_pCheckLB->SetSelectHdl(aLink);
+    m_pCheckLB->SetSelectHdl(LINK(this, SvxFontSubstTabPage, TreeListBoxSelectHdl));
     m_pUseTableCB->SetClickHdl(aClickLink);
     m_pFont1CB->SetSelectHdl(aLink);
     m_pFont1CB->SetModifyHdl(aLink);
@@ -261,7 +261,10 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void)
 {
     SelectHdl(pButton);
 }
-
+IMPL_LINK_TYPED(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void)
+{
+    SelectHdl(pButton);
+}
 IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 {
     if (pWin == m_pApply || pWin == m_pDelete)
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index f82330bba6d5..7aae90361019 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -83,6 +83,7 @@ class SvxFontSubstTabPage : public SfxTabPage
 
     DECL_LINK(SelectHdl, vcl::Window *);
     DECL_LINK_TYPED(ClickHdl, Button*, void);
+    DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void);
     DECL_LINK_TYPED(NonPropFontsHdl, Button*, void);
 
     SvTreeListEntry*    CreateEntry(OUString& rFont1, OUString& rFont2);
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index c4676a1446b9..d049e93cb56c 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -920,7 +920,7 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry)
     m_pPrefBox->Expand( pParentEntry );
 }
 
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl )
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool )
 {
     SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry();
 
@@ -938,7 +938,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl )
         }
     }
 
-    return 1;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 35fdd5559c41..047d267e52b3 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -65,7 +65,7 @@ private:
     DECL_LINK( DoubleClickHdl_Impl, void* );
     DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void );
     DECL_LINK_TYPED( SearchHdl_Impl, Button*, void );
-    DECL_LINK( ExpandingHdl_Impl, void* );
+    DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool );
 
 public:
    explicit CuiAboutConfigTabPage(vcl::Window* pParent);
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9b3e949a6fa2..dc0b99b1af0d 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -565,7 +565,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
 
 
 
-IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
+IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void)
 {
     if(!bDoNothing)
     {
@@ -587,7 +587,6 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
         pNewReplacePB->Enable(false);
         pDeletePB->Enable( true && !IsDicReadonly_Impl() );
     }
-    return 0;
 };
 
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3d6320ce433a..8c805b8f6871 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -245,18 +245,17 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void)
 
 
 
-IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList )
+IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void )
 {
     SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() )
                                 : m_pJavaList->FirstSelected();
     if ( pEntry )
         m_pJavaList->HandleEntryChecked( pEntry );
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void)
 {
     // set installation directory info
     SvTreeListEntry* pEntry = m_pJavaList->FirstSelected();
@@ -267,7 +266,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
     if ( pLocation )
         sInfo += *pLocation;
     m_pJavaPathText->SetText(sInfo);
-    return 0;
 }
 
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 1cb35fe665a4..c4f9602ca428 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -85,8 +85,8 @@ private:
     css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
 
     DECL_LINK_TYPED(        EnableHdl_Impl, Button*, void);
-    DECL_LINK(              CheckHdl_Impl, SvSimpleTable * );
-    DECL_LINK(              SelectHdl_Impl, void *);
+    DECL_LINK_TYPED(        CheckHdl_Impl, SvTreeListBox*, void );
+    DECL_LINK_TYPED(        SelectHdl_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED(        AddHdl_Impl, Button*, void);
     DECL_LINK_TYPED(        ParameterHdl_Impl, Button*, void);
     DECL_LINK_TYPED(        ClassPathHdl_Impl, Button*, void);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index b855be3d6de9..307cdcdf67d1 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1550,7 +1550,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
 
 
 
-IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void )
 {
     if (pBox == m_pLinguModulesCLB)
     {
@@ -1576,7 +1576,6 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
             }
         }
     }
-    return 0;
 }
 
 
@@ -1761,7 +1760,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
 
 
 
-IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void )
 {
     if (m_pLinguModulesCLB == pBox)
     {
@@ -1791,8 +1790,6 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox )
     {
         OSL_FAIL( "pBox unexpected value" );
     }
-
-    return 0;
 }
 
 
@@ -1948,7 +1945,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol
     return pEntry;
 }
 
-IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void )
 {
     if (m_pModulesCLB == pBox)
     {
@@ -1960,7 +1957,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
             ModuleUserData_Impl* pData = static_cast<ModuleUserData_Impl*>(pEntry->GetUserData());
             if(!pData->IsParent() && pData->GetType() != TYPE_HYPH)
             {
-                sal_uLong  nCurPos = pBox->GetSelectEntryPos();
+                sal_uLong  nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectEntryPos();
                 if(nCurPos < pBox->GetEntryCount() - 1)
                 {
                     bDisableDown = static_cast<ModuleUserData_Impl*>(pBox->
@@ -1980,15 +1977,13 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
     {
         OSL_FAIL( "pBox unexpected value" );
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void )
 {
     BoxCheckButtonHdl_Impl(NULL);
 }
-IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, /*pBox*/ )
+IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void )
 {
     SvTreeListEntry *pCurEntry = m_pModulesCLB->GetCurEntry();
     if (pCurEntry)
@@ -2014,7 +2009,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, /*pBox*/
             }
         }
     }
-    return 0;
 }
 
 IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7bddba3e8341..eb0037d965e6 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -381,7 +381,7 @@ void SvxPathTabPage::FillUserData()
 
 
 
-IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void)
 {
     sal_uInt16 nSelCount = 0;
     SvTreeListEntry* pEntry = pPathBox->FirstSelected();
@@ -399,7 +399,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
 
     m_pPathBtn->Enable( 1 == nSelCount && bEnable);
     m_pStandardBtn->Enable( nSelCount > 0 && bEnable);
-    return 0;
 }
 
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e83351f80191..f386c7c423b3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -651,10 +651,9 @@ sal_uInt16  OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName,
     return nRet - 1;
 }
 
-IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void)
 {
     SelectHdl_Impl();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void)
@@ -726,8 +725,8 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void)
 }
 
 // an opened group shall be completely visible
-IMPL_STATIC_LINK(
-    OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
+IMPL_STATIC_LINK_TYPED(
+    OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox, void )
 {
     pBox->Update();
     pBox->InitStartEntry();
@@ -758,7 +757,6 @@ IMPL_STATIC_LINK(
             }
         }
     }
-    return 0;
 }
 
 void OfaTreeOptionsDialog::ApplyItemSets()
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 1d7301fb128b..d575601d3df7 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -294,7 +294,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void)
 }
 
 
-IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
     if ( !pEntry )
@@ -311,8 +311,6 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
         sal_Int32 nPos = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData());
         m_pChangeBtn->Enable( nPos < m_nPos );
     }
-
-    return 0;
 }
 
 
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index a9b8de1834ec..f7ed38ed8e03 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -54,7 +54,7 @@ namespace svx
         DECL_LINK_TYPED( RemovePasswordHdl, Button*, void );
         DECL_LINK_TYPED( RemoveAllPasswordsHdl, Button*, void );
         DECL_LINK_TYPED( ChangePasswordHdl, Button*, void );
-        DECL_LINK( EntrySelectedHdl, void* );
+        DECL_LINK_TYPED( EntrySelectedHdl, SvTreeListBox*, void );
 
         void FillPasswordList();
 
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b5aa5bdc48de..009c5e7b947d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -717,10 +717,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
     m_pCheckLB->SetUpdateMode(true);
 }
 
-IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox)
+IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void)
 {
     m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData());
-    return 0;
 }
 
 IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl)
@@ -1150,7 +1149,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
     }
 }
 
-IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
+IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void)
 {
     if(!bFirstSelect || !bHasSelectionText)
     {
@@ -1180,7 +1179,6 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
 
     m_pNewReplacePB->Enable(false);
     m_pDeleteReplacePB->Enable();
-    return 0;
 };
 
 void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sLong, bool bKeepSourceFormatting)
@@ -2622,10 +2620,10 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl)
 
 /** Handler for the list box
 */
-IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
+IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void)
 {
     if ( m_pSmartTagTypesLB->GetEntryCount() < 1 )
-        return 0;
+        return;
 
     const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos();
     const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos);
@@ -2638,8 +2636,6 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
         m_pPropertiesPB->Enable( true );
     else
         m_pPropertiesPB->Enable( false );
-
-    return 0;
 }
 
 /** Propagates the current settings to the smart tag manager.
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index cfa8eecc4e55..153ce47b39e4 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -261,7 +261,7 @@ bool _SfxMacroTabPage::IsReadOnly() const
     return mpImpl->bReadOnly;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
+IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
 {
     SvHeaderTabListBox&     rListBox = mpImpl->pEventLB->GetListBox();
     SvTreeListEntry*            pE = rListBox.FirstSelected();
@@ -270,15 +270,14 @@ IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
         ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
     {
         DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" );
-        return 0;
+        return;
     }
 
     ScriptChanged();
     EnableButtons();
-    return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, )
+IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void)
 {
     mpImpl->pGroupLB->GroupSelected();
     const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
@@ -288,13 +287,11 @@ IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, )
     mpImpl->pMacroFrame->set_label( aLabelText );
 
     EnableButtons();
-    return 0;
 }
 
-IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, )
+IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void)
 {
     EnableButtons();
-    return 0;
 }
 
 IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 173ca19d0e7e..8308d2e3e46f 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -338,7 +338,7 @@ void SvxNumberFormatTabPage::Init_Impl()
     Link<> aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
 
     m_pLbCategory->SetSelectHdl( aLink );
-    m_pLbFormat->SetSelectHdl( aLink );
+    m_pLbFormat->SetSelectHdl( LINK( this, SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl ) );
     m_pLbLanguage->SetSelectHdl( aLink );
     m_pLbCurrency->SetSelectHdl( aLink );
     m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) );
@@ -1194,6 +1194,10 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, v
 {
     SelFormatHdl_Impl(pLb);
 }
+IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, SvTreeListBox*, pLb, void )
+{
+    SelFormatHdl_Impl(pLb);
+}
 IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
 {
     if (pLb == m_pCbSourceFormat)