convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

22 files changed, 57 insertions, 68 deletions

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index ba1a7ad6c6a2..b917770965cd 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1258,10 +1258,10 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl)
     return 0;
 }
 
-IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks )
+IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void )
 {
     if (pChecks != maChecks.get())
-        return 0;
+        return;
     SvTreeListEntry* pEntry = pChecks->GetHdlEntry();
     if ( pEntry )
         maChecks->CheckEntry( pEntry,  ( pChecks->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) );
@@ -1280,7 +1280,6 @@ IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks )
         maBtnOk->Enable(nNumChecked != 0);
 
     mePrevToggleAllState = maChkToggleAll->GetState();
-    return 0;
 }
 
 void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt)
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 0c1a9cefd906..e28d4284a880 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -352,12 +352,11 @@ IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void )
     }
 }
 
-IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox )
+IMPL_LINK_TYPED( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void )
 {
     // enable/disable OK button on modifying check list box
     if( pListBox == mpLbUnits )
         mpBtnOk->Enable( mpLbUnits->GetCheckedEntryCount() > 0 );
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 65fb0590005b..da4afa5c006e 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -101,8 +101,8 @@ void ScTpSubTotalGroup::Init()
     OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-(" );
 
     mpLbGroup->SetSelectHdl       ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
-    mpLbColumns->SetSelectHdl     ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
-    mpLbColumns->SetCheckButtonHdl    ( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
+    mpLbColumns->SetSelectHdl     ( LINK( this, ScTpSubTotalGroup, SelectTreeListBoxHdl ) );
+    mpLbColumns->SetCheckButtonHdl( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
     mpLbFunctions->SetSelectHdl   ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
 
     nFieldArr[0] = 0;
@@ -342,6 +342,10 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
 
 // Handler:
 
+IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void )
+{
+    SelectHdl(pLb);
+}
 IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb )
 {
     if (   (mpLbColumns->GetEntryCount() > 0)
@@ -368,7 +372,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb )
     return 0;
 }
 
-IMPL_LINK( ScTpSubTotalGroup, CheckHdl, void *, pLb )
+IMPL_LINK_TYPED( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void )
 {
     if ( pLb == mpLbColumns )
     {
@@ -380,7 +384,6 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, void *, pLb )
             SelectHdl( pLb );
         }
     }
-    return 0;
 }
 
 // Derived Group TabPages:
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index e1600f56d872..f9f2c12c3804 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -91,10 +91,10 @@ bool SearchResultsDlg::Close()
     return ModelessDialog::Close();
 }
 
-IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl )
+IMPL_LINK_NOARG_TYPED( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void )
 {
     if (!mpDoc)
-        return 0;
+        return;
 
     SvTreeListEntry *pEntry = mpList->FirstSelected();
     OUString aTabStr = SvTabListBox::GetEntryText(pEntry, 0);
@@ -103,21 +103,19 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl )
     SCTAB nTab = -1;
     if (!mpDoc->GetTable(aTabStr, nTab))
         // No sheet with specified name.
-        return 0;
+        return;
 
     ScAddress aPos;
     sal_uInt16 nRes = aPos.Parse(aPosStr, mpDoc, mpDoc->GetAddressConvention());
     if (!(nRes & SCA_VALID))
         // Invalid address string.
-        return 0;
+        return;
 
     // Jump to the cell.
     ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
     pScViewShell->SetTabNo(nTab);
     pScViewShell->SetCursor(aPos.Col(), aPos.Row());
     pScViewShell->AlignToCursor(aPos.Col(), aPos.Row(), SC_FOLLOW_JUMP);
-
-    return 0;
 }
 
 SearchResultsDlgWrapper::SearchResultsDlgWrapper(
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index c0ea474dfb47..b18442adae8c 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -103,8 +103,8 @@ private:
     DECL_LINK( AcceptHandle, SvxTPView*);
     DECL_LINK( RejectAllHandle, void*);
     DECL_LINK( AcceptAllHandle, void*);
-    DECL_LINK( ExpandingHandle, SvxRedlinTable*);
-    DECL_LINK( SelectHandle, void*);
+    DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool);
+    DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void);
     DECL_LINK( RefInfoHandle, OUString*);
 
     DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index ceffe378bc69..5f42cfcdb76e 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -330,7 +330,7 @@ private:
 
     DECL_LINK_TYPED( ButtonHdl, Button*, void );
     DECL_LINK_TYPED( TriStateHdl, Button*, void );
-    DECL_LINK( CheckHdl, SvTreeListBox* );
+    DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void );
     DECL_LINK( EdModifyHdl, void* );
 
 private:
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 0ccea7822fa7..404a9fd69acb 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -149,8 +149,8 @@ private:
     void                KeepHandler( bool bMine );
     void                KeepAllHandler( bool bMine );
 
-    DECL_LINK( SelectHandle, void* );
-    DECL_LINK( DeselectHandle, void* );
+    DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void );
+    DECL_LINK_TYPED( DeselectHandle, SvTreeListBox*, void );
     DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
     DECL_LINK_TYPED( KeepMineHandle, Button*, void );
     DECL_LINK_TYPED( KeepOtherHandle, Button*, void );
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 21d48bb6aebe..8b35371f734e 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -120,7 +120,7 @@ public:
 
 private:
     DECL_LINK_TYPED( ClickHdl, Button*, void );
-    DECL_LINK( CheckHdl, SvxCheckListBox* );
+    DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void );
 
 private:
     VclPtr<RadioButton>         mpRbAutoStart;
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index dd125914360b..6678b31ef813 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -106,7 +106,7 @@ private:
     DECL_LINK_TYPED( RemoveBtnHdl, Button*, void );
     DECL_LINK( EdModifyHdl, void * );
     DECL_LINK( AssignGetFocusHdl, void * );
-    DECL_LINK( SelectionChangedHdl_Impl, void* );
+    DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void );
     DECL_LINK( ScopeChangedHdl, void* );
 
 protected:
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index c51d23355dbc..ee6e384626b1 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -81,7 +81,7 @@ public:
     bool IsMultiSelection();
     std::vector<ScRangeNameLine> GetSelectedEntries();
 
-    DECL_LINK( ScrollHdl, void*);
+    DECL_LINK_TYPED( ScrollHdl, SvTreeListBox*, void);
     DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void);
 };
 
diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx
index 22af42940f1c..57ff716e3065 100644
--- a/sc/source/ui/inc/searchresults.hxx
+++ b/sc/source/ui/inc/searchresults.hxx
@@ -16,6 +16,7 @@
 class ScDocument;
 class ScRangeList;
 class SvSimpleTable;
+class SvTreeListBox;
 
 namespace sc {
 
@@ -25,7 +26,7 @@ class SearchResultsDlg : public ModelessDialog
     SfxBindings* mpBindings;
     ScDocument* mpDoc;
 
-    DECL_LINK( ListSelectHdl, void * );
+    DECL_LINK_TYPED( ListSelectHdl, SvTreeListBox*, void );
 public:
     SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId );
     virtual ~SearchResultsDlg();
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index db7926f9afab..230bfa2d2c61 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -46,7 +46,7 @@ class ScSolverOptionsDialog : public ModalDialog
     com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties;
 
     DECL_LINK( EngineSelectHdl, void* );
-    DECL_LINK( SettingsSelHdl, void* );
+    DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void );
     DECL_LINK( SettingsDoubleClickHdl, void* );
     DECL_LINK_TYPED( ButtonHdl, Button*, void );
 
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index f31b635b51e5..627f176dca5a 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -36,8 +36,8 @@ struct ScSubTotalParam;
 class ScTpSubTotalGroup : public SfxTabPage
 {
 protected:
-            ScTpSubTotalGroup( vcl::Window* pParent,
-                               const SfxItemSet& rArgSet );
+    ScTpSubTotalGroup( vcl::Window* pParent,
+                       const SfxItemSet& rArgSet );
 
 public:
     virtual ~ScTpSubTotalGroup();
@@ -70,22 +70,23 @@ private:
     sal_uInt16          GetFieldSelPos  ( SCCOL nField );
 
     // Handler ------------------------
-    DECL_LINK( SelectHdl, void * );
-    DECL_LINK( CheckHdl, void * );
+    DECL_LINK( SelectHdl, void* );
+    DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void );
+    DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void );
 };
 
 class ScTpSubTotalGroup1 : public ScTpSubTotalGroup
 {
     friend class VclPtr<ScTpSubTotalGroup1>;
 protected:
-            ScTpSubTotalGroup1( vcl::Window*              pParent,
-                                const SfxItemSet&    rArgSet );
+    ScTpSubTotalGroup1( vcl::Window*              pParent,
+                        const SfxItemSet&    rArgSet );
 
 public:
     virtual ~ScTpSubTotalGroup1();
 
     static  VclPtr<SfxTabPage> Create      ( vcl::Window*               pParent,
-                                      const SfxItemSet*     rArgSet );
+            const SfxItemSet*     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
@@ -94,14 +95,14 @@ class ScTpSubTotalGroup2 : public ScTpSubTotalGroup
 {
     friend class VclPtr<ScTpSubTotalGroup2>;
 protected:
-            ScTpSubTotalGroup2( vcl::Window*              pParent,
-                                const SfxItemSet&    rArgSet );
+    ScTpSubTotalGroup2( vcl::Window*              pParent,
+                        const SfxItemSet&    rArgSet );
 
 public:
     virtual ~ScTpSubTotalGroup2();
 
     static  VclPtr<SfxTabPage> Create      ( vcl::Window*               pParent,
-                                      const SfxItemSet*     rArgSet );
+            const SfxItemSet*     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
@@ -110,14 +111,14 @@ class ScTpSubTotalGroup3 : public ScTpSubTotalGroup
 {
     friend class VclPtr<ScTpSubTotalGroup3>;
 protected:
-            ScTpSubTotalGroup3( vcl::Window*              pParent,
-                                const SfxItemSet&    rArgSet );
+    ScTpSubTotalGroup3( vcl::Window*              pParent,
+                        const SfxItemSet&    rArgSet );
 
 public:
     virtual ~ScTpSubTotalGroup3();
 
     static  VclPtr<SfxTabPage> Create      ( vcl::Window*               pParent,
-                                      const SfxItemSet*     rArgSet );
+            const SfxItemSet*     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
@@ -126,14 +127,14 @@ class ScTpSubTotalOptions : public SfxTabPage
 {
     friend class VclPtr<ScTpSubTotalOptions>;
 protected:
-            ScTpSubTotalOptions( vcl::Window*             pParent,
-                                  const SfxItemSet&  rArgSet );
+    ScTpSubTotalOptions( vcl::Window*             pParent,
+                         const SfxItemSet&  rArgSet );
 
 public:
     virtual ~ScTpSubTotalOptions();
     virtual void        dispose() SAL_OVERRIDE;
     static VclPtr<SfxTabPage>  Create      ( vcl::Window*               pParent,
-                                      const SfxItemSet*     rArgSet );
+            const SfxItemSet*     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 44c6d7ebc3c1..540c5a2ad49c 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -96,7 +96,7 @@ private:
 
     DECL_LINK(GetFocusHdl, Control*);
     DECL_LINK_TYPED(BtnPressedHdl, Button*, void);
-    DECL_LINK(TreeItemSelectHdl, void*);
+    DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void);
     DECL_LINK(RefModifiedHdl, void*);
 };
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 44088710cca3..1533022db4c8 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1109,13 +1109,12 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle)
+IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void)
 {
     if(!bNoSelection)
         aSelectionIdle.Start();
 
     bNoSelection=false;
-    return 0;
 }
 
 void ScAcceptChgDlg::GetDependents(  const ScChangeAction* pScChangeAction,
@@ -1347,7 +1346,7 @@ bool ScAcceptChgDlg::Expand(
     return bTheTestFlag;
 }
 
-IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
+IMPL_LINK_TYPED( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool )
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     SetPointer(Pointer(PointerStyle::Wait));
@@ -1410,7 +1409,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
         }
     }
     SetPointer(Pointer(PointerStyle::Arrow));
-    return (sal_uLong) true;
+    return true;
 }
 
 void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction,
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 907938dc27db..ae00e39adb4c 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -537,33 +537,29 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
     }
 }
 
-IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void)
 {
     if ( mbInSelectHdl || mbInDeselectHdl )
     {
-        return 0;
+        return;
     }
 
     mbInSelectHdl = true;
     HandleListBoxSelection( true );
     maSelectionIdle.Start();
     mbInSelectHdl = false;
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void)
 {
     if ( mbInDeselectHdl || mbInSelectHdl )
     {
-        return 0;
+        return;
     }
 
     mbInDeselectHdl = true;
     HandleListBoxSelection( false );
     mbInDeselectHdl = false;
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(ScConflictsDlg, UpdateSelectionHdl, Idle *, void)
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 5593a071a56a..9df9f459ed7f 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
+IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void)
 {
     bool bCheckbox = false;
 
@@ -390,8 +390,6 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
     }
 
     m_pBtnEdit->Enable( !bCheckbox );
-
-    return 0;
 }
 
 ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent)
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 63ae44dca41a..eee65db5258d 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -515,10 +515,9 @@ IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl)
+IMPL_LINK_NOARG_TYPED(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void)
 {
     SelectionChanged();
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 2a6f78becef3..30b77beaae85 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -299,10 +299,9 @@ IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void)
     SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT );
 }
 
-IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl)
+IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void)
 {
     CheckForFormulaString();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 8349ed374125..ad012fcc7cd1 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -246,10 +246,9 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnAutomaticSelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScCalcOptionsDialog, DeviceSelHdl)
+IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, DeviceSelHdl, SvTreeListBox*, void)
 {
     SelectedDeviceChanged();
-    return 0;
 }
 
 IMPL_LINK(ScCalcOptionsDialog, EditModifiedHdl, Edit*, pCtrl)
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 633762e6b253..c47e178255d3 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -39,7 +39,7 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK( BtnAutomaticSelectHdl, void* );
-    DECL_LINK( DeviceSelHdl, void* );
+    DECL_LINK_TYPED( DeviceSelHdl, SvTreeListBox*, void );
     DECL_LINK( EditModifiedHdl, Edit * );
     DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void );
     DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 353a521e175f..deb99aa3dab3 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -103,8 +103,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(
     mpRefEdit->SetGetFocusHdl(aLink);
     mpRefBtn->SetGetFocusHdl(aLink);
 
-    aLink = LINK(this, ScXMLSourceDlg, TreeItemSelectHdl);
-    mpLbTree->SetSelectHdl(aLink);
+    mpLbTree->SetSelectHdl(LINK(this, ScXMLSourceDlg, TreeItemSelectHdl));
 
     aLink = LINK(this, ScXMLSourceDlg, RefModifiedHdl);
     mpRefEdit->SetModifyHdl(aLink);
@@ -679,10 +678,9 @@ IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void)
         CancelPressed();
 }
 
-IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl)
+IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void)
 {
     TreeItemSelected();
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScXMLSourceDlg, RefModifiedHdl)