convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

7 files changed, 13 insertions, 20 deletions

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index c97480b1132c..81351a3aeba3 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -234,7 +234,7 @@ protected:
     virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
 
     DECL_LINK_TYPED( ButtonHdl, Button *, void );
-    DECL_LINK(TreeListHdl, void *);
+    DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void);
     DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void );
     DECL_LINK_TYPED( EditAccHdl, Accelerator *, void );
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 5de9144aeb87..95924e329404 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1790,13 +1790,11 @@ IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void )
             pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
 }
 
-IMPL_LINK_NOARG(WatchWindow, TreeListHdl)
+IMPL_LINK_NOARG_TYPED(WatchWindow, TreeListHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry();
     if ( pCurEntry && pCurEntry->GetUserData() )
         aXEdit->SetText( static_cast<WatchItem*>(pCurEntry->GetUserData())->maName );
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void )
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index d085c0227cc6..bed7a622690b 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -482,7 +482,7 @@ IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl)
     return 0;
 }
 
-IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
 {
     // Is also called if deselected!
     // Two function calls in every SelectHdl because
@@ -493,17 +493,16 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
         UpdateFields();
         CheckButtons();
     }
-    return 0;
 }
 
-IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
 {
     // Is also called if deselected!
     // Two function calls in every SelectHdl because
     // there's no separate DeselectHDL.
     // So find out if select or deselect:
     if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
-        return 0;
+        return;
 
     SbModule* pModule = m_pBasicBox->FindModule( m_pBasicBox->GetCurEntry() );
 
@@ -547,7 +546,6 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
 
     UpdateFields();
     CheckButtons();
-    return 0;
 }
 
 
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index bbb4e2811201..c16d7d18b0c1 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -67,9 +67,9 @@ private:
 
     Mode                    nMode;
 
-    DECL_LINK( MacroSelectHdl, SvTreeListBox * );
+    DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void );
     DECL_LINK(MacroDoubleClickHdl, void *);
-    DECL_LINK( BasicSelectHdl, SvTreeListBox * );
+    DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void );
     DECL_LINK( EditModifyHdl, Edit * );
     DECL_LINK_TYPED( ButtonHdl, Button *, void );
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 4f56a1a5aaef..bc0d1ff5abcd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -605,16 +605,14 @@ void LibPage::DeactivatePage()
 {
 }
 
-IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
 {
     if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
         CheckButtons();
-    return 0;
 }
 
-IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox )
+IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, /*pBox*/ )
 {
-    (void)pBox;
     SetCurLib();
     CheckButtons();
     return 0;
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 545e178d2e8f..0403038aa33c 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -684,13 +684,12 @@ void ObjectPage::CheckButtons()
         m_pDelButton->Disable();
 }
 
-IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, TreeListBox *, pBox )
+IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
 {
     if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
-        return 0;
+        return;
 
     CheckButtons();
-    return 0;
 }
 
 IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index b4505b32ee28..1c56dced5993 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -190,7 +190,7 @@ protected:
     VclPtr<PushButton>         m_pNewDlgButton;
     VclPtr<PushButton>         m_pDelButton;
 
-    DECL_LINK( BasicBoxHighlightHdl, TreeListBox * );
+    DECL_LINK_TYPED( BasicBoxHighlightHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED( ButtonHdl, Button *, void );
     void                CheckButtons();
     bool                GetSelection( ScriptDocument& rDocument, OUString& rLibName );
@@ -229,7 +229,7 @@ protected:
     ScriptDocument      m_aCurDocument;
     LibraryLocation     m_eCurLocation;
 
-    DECL_LINK( TreeListHighlightHdl, SvTreeListBox * );
+    DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void );
     DECL_LINK( BasicSelectHdl, ListBox * );
     DECL_LINK_TYPED( ButtonHdl, Button *, void );
     DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * );