convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

20 files changed, 45 insertions, 46 deletions

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 6625503a4baf..63f5f77d4121 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -86,7 +86,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
     m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
     m_pRemovePB->SetClickHdl(      LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
     m_pAssignPB->SetClickHdl(      LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
-    m_pTbLinks->SetSelectHdl(      LINK(this, SwCondCollPage, SelectHdl));
+    m_pTbLinks->SetSelectHdl(      LINK(this, SwCondCollPage, SelectTreeListBoxHdl));
     m_pStyleLB->SetSelectHdl(      LINK(this, SwCondCollPage, SelectHdl));
     m_pFilterLB->SetSelectHdl(     LINK(this, SwCondCollPage, SelectHdl));
 
@@ -260,12 +260,16 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
     return 0;
 }
 
-IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
+IMPL_LINK_TYPED( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void)
+{
+    SelectHdl(pBox);
+}
+IMPL_LINK( SwCondCollPage, SelectHdl, void*, pBox)
 {
     if (pBox == m_pFilterLB)
     {
         m_pStyleLB->Clear();
-        const sal_Int32 nSelPos = pBox->GetSelectEntryPos();
+        const sal_Int32 nSelPos = static_cast<ListBox*>(pBox)->GetSelectEntryPos();
         const sal_uInt16 nSearchFlags = *static_cast<sal_uInt16*>(m_pFilterLB->GetEntryData(nSelPos));
         SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags);
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index df64fbd2a2d3..7b101cecc533 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -680,7 +680,7 @@ void SwCaptionOptPage::DelUserData()
     }
 }
 
-IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl)
+IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected();
 
@@ -787,18 +787,14 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl)
     }
 
     ModifyHdl();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl)
+IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pEntry = m_pCheckLB->GetHdlEntry();
 
     if (pEntry) // save all
         SaveEntry(pEntry);
-
-    return 0;
 }
 
 void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 33f283b69730..3456e45a21a3 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -469,12 +469,11 @@ IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void)
     }
 };
 
-IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
     Application::PostUserEvent( LINK( this, SwAddressListDialog,
                                       StaticListBoxSelectHdl_Impl ), pSelect, true );
-    return 0;
 }
 
 IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void)
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 921ece655941..e1bca3a82ed0 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -77,7 +77,7 @@ class SwAddressListDialog : public SfxModalDialog
     DECL_LINK_TYPED(FilterHdl_Impl, Button*, void);
     DECL_LINK_TYPED(LoadHdl_Impl, Button*, void);
     DECL_LINK_TYPED(CreateHdl_Impl, Button*, void);
-    DECL_LINK(ListBoxSelectHdl_Impl, void *);
+    DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void);
     DECL_LINK_TYPED(EditHdl_Impl, Button*, void);
     DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void);
     DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index c4219fc243cf..9e9c4fef304b 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -592,12 +592,11 @@ IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void)
     EndDialog(RET_OK);
 }
 
-IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox)
+IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void)
 {
     sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData());
     // Check if the selected entry is already in the address and then forbid inserting
     m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData));
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 2a18a5f7a46b..c2164082b7e8 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -221,7 +221,7 @@ private:
     DialogType              m_eType;
 
     DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
-    DECL_LINK(ListBoxSelectHdl_Impl, DDListBox*);
+    DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void);
     DECL_LINK(EditModifyHdl_Impl, void *);
     DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void);
     DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit*);
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index b0785205aad2..e1d8502f0125 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -569,7 +569,7 @@ void    SwEditRegionDlg::SelectSection(const OUString& rSectionName)
 
 // selected entry in TreeListBox is showed in Edit window in case of
 // multiselection some controls are disabled
-IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void )
 {
     bDontCheckPasswd = true;
     SvTreeListEntry* pEntry=pBox->FirstSelected();
@@ -669,7 +669,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
             pBox->SelectAll( false );
             pBox->Select( pEntry );
             GetFirstEntryHdl(pBox);
-            return 0;
+            return;
         }
         else
             m_pPasswdCB->Check(aCurPasswd.getLength() > 0);
@@ -727,10 +727,9 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
         m_pPasswdPB->Enable(bPasswdEnabled);
     }
     bDontCheckPasswd = false;
-    return 0;
 }
 
-IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void )
 {
     if( !pBox->GetSelectionCount() )
     {
@@ -750,7 +749,6 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
         UseFileHdl(m_pFileCB);
         DDEHdl(m_pDDECB);
     }
-    return 0;
 }
 
 // in OkHdl the modified settings are being applied and reversed regions are deleted
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 8159a72c6a3a..9b27a7cfecd0 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -601,7 +601,7 @@ SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& r
     m_pAutoTextLB->SetSelectionMode( SINGLE_SELECTION );
 
     SetExchangeSupport();
-    m_pAutoTextLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl));
+    m_pAutoTextLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectTreeListBoxHdl));
     m_pAutoTextGroupLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl));
 
     m_pExampleWIN->Hide();
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index b5a9c92eeb43..346349a1cbfc 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -133,6 +133,10 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl)
     return 0;
 }
 
+IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, pBox, void )
+{
+    AutoTextSelectHdl(pBox);
+}
 IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
 {
     if(m_xAutoText.is())
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 7306303ae422..4167c43c94fe 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -97,6 +97,7 @@ class SwVisitingCardPage : public SfxTabPage
     SwOneExampleFrame*  pExampleFrame;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText;
 
+    DECL_LINK_TYPED( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void );
     DECL_LINK( AutoTextSelectHdl, void* );
     DECL_LINK( FrameControlInitializedHdl, void* );
 
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 0ab326297cfe..3911cd579a5c 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -75,13 +75,13 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
     m_pUsedDBTLB->SetSpaceBetweenEntries(0);
     m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND));
 
-    Link<> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
+    Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
 
     m_pUsedDBTLB->SetSelectHdl(aLink);
     m_pUsedDBTLB->SetDeselectHdl(aLink);
     m_pAvailDBTLB->SetSelectHdl(aLink);
     m_pAvailDBTLB->SetSelectHdl(aLink);
-    TreeSelectHdl();
+    TreeSelectHdl(NULL);
 }
 
 // initialise database listboxes
@@ -231,7 +231,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void)
     EndDialog(RET_OK);
 }
 
-IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
+IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry();
 
@@ -242,7 +242,6 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
             bEnable = true;
         m_pDefineBT->Enable( bEnable );
     }
-    return 0;
 }
 
 // convert database name for display
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f433a5e414ff..71c871a23b2a 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -434,7 +434,7 @@ void SwFieldDBPage::CheckInsert()
     EnableInsert(bInsert);
 }
 
-IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void )
 {
     SvTreeListEntry* pEntry = pBox->GetCurEntry();
     if (pEntry)
@@ -472,7 +472,6 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
             m_pFormat->Enable(bNumFormat);
         }
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void)
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index b663cc4956ad..cc118696dc17 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -56,7 +56,7 @@ class SwFieldDBPage : public SwFieldPage
 
     DECL_LINK( TypeHdl, ListBox* );
     DECL_LINK( NumSelectHdl, NumFormatListBox* );
-    DECL_LINK( TreeSelectHdl, SvTreeListBox* );
+    DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void );
     DECL_LINK(ModifyHdl, void *);
     DECL_LINK_TYPED(AddDBHdl, Button*, void);
 
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 4385b64cd4f3..267c634535e4 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -202,7 +202,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
 
     FillSelectionLB(nSubType);
     if ( pSelEntry )
-        TypeHdl();
+        TypeHdl(NULL);
 
     m_pTypeTLB->SetUpdateMode(true);
     m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl));
@@ -219,7 +219,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl)
+IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
 {
     // save old ListBoxPos
     SvTreeListEntry* pOldEntry = pSelEntry;
@@ -236,8 +236,6 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl)
         FillSelectionLB((sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()));
 
     SubTypeHdl();
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl)
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 7a1ea48df165..e4ebe9278d9b 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -50,7 +50,7 @@ class SwFieldDokInfPage : public SwFieldPage
     sal_uLong               nOldFormat;
     OUString     m_sOldCustomFieldName;
 
-    DECL_LINK(TypeHdl, void * = 0);
+    DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void);
     DECL_LINK(SubTypeHdl, void * = 0);
 
     sal_Int32               FillSelectionLB(sal_uInt16 nSubTypeId);
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 16f2182c49ab..c7a135a61c8d 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -98,7 +98,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet
     m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldRefPage, InsertHdl));
 
     // #i83479#
-    m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeHdl) );
+    m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeTreeListBoxHdl) );
     m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) );
     m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL );
     m_pSelectionToolTipLB->SetSpaceBetweenEntries(1);
@@ -407,13 +407,17 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl)
         bool bFormat = nSize != 0;
         m_pFormat->Enable(bFormat);
 
-        SubTypeHdl();
-        ModifyHdl();
+        SubTypeHdl(NULL);
+        ModifyHdl(NULL);
     }
 
     return 0;
 }
 
+IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void)
+{
+    SubTypeHdl(NULL);
+}
 IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index bb1f683d7b5e..24e5944d6b1b 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -62,6 +62,7 @@ class SwFieldRefPage : public SwFieldPage
 
     DECL_LINK(TypeHdl, void *);
     DECL_LINK(SubTypeHdl, void * = 0);
+    DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void);
     DECL_LINK(ModifyHdl, void * = 0);
 
     void                UpdateSubType();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 2e0e2c465df0..9601f18b5e61 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2131,8 +2131,8 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
         else
             m_pLevelFT->SetText(sLevelStr);
 
-        Link<> aLink = m_pLevelLB->GetSelectHdl();
-        m_pLevelLB->SetSelectHdl(Link<>());
+        Link<SvTreeListBox*,void> aLink = m_pLevelLB->GetSelectHdl();
+        m_pLevelLB->SetSelectHdl(Link<SvTreeListBox*,void>());
         m_pLevelLB->Select( m_pLevelLB->GetEntry( bToxIsIndex ? 1 : 0 ) );
         m_pLevelLB->SetSelectHdl(aLink);
 
@@ -2368,10 +2368,10 @@ void SwTOXEntryTabPage::WriteBackLevel()
     }
 }
 
-IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
+IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void)
 {
     if(bInLevelHdl)
-        return 0;
+        return;
     bInLevelHdl = true;
     WriteBackLevel();
 
@@ -2409,7 +2409,6 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
     }
     bInLevelHdl = false;
     pBox->GrabFocus();
-    return 0;
 }
 
 IMPL_LINK_TYPED(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c3f031e9861e..e7a5ab463dfd 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -184,7 +184,7 @@ void SwGlossaryGroupDlg::Apply()
     }
 }
 
-IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*,  )
+IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void )
 {
     m_pNewPB->Enable(false);
     SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected();
@@ -205,7 +205,6 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*,  )
         m_pRenamePB->Enable(!bExists && !sName.isEmpty());
         m_pDelPB->Enable(IsDeleteAllowed(sEntry));
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 0f411c2c4294..d89f30d81fac 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -273,11 +273,11 @@ void SwGlossaryDlg::dispose()
 }
 
 // select new group
-IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void )
 {
     SvTreeListEntry* pEntry = pBox->FirstSelected();
     if(!pEntry)
-        return 0;
+        return;
     SvTreeListEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry;
     GroupUserData* pGroupData = static_cast<GroupUserData*>(pParent->GetUserData());
     ::SetCurrGlosGroup(pGroupData->sGroupName
@@ -316,7 +316,6 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
         aReq.AppendItem(SfxStringItem(FN_SET_ACT_GLOSSARY, sTemp));
         aReq.Done();
     }
-    return 0;
 }
 
 void SwGlossaryDlg::Apply()