Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

33 files changed, 41 insertions, 64 deletions

diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 129e884e4ce8..f55dc972db63 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -74,7 +74,7 @@ public:
     const OUString& GetSource() const       { return aSourceArea;   }
     const ScRange&  GetDestArea() const     { return aDestArea;     }
 
-    DECL_LINK( RefreshHdl, void* );
+    DECL_LINK_TYPED( RefreshHdl, Timer*, void );
     DECL_LINK( AreaEndEditHdl, void* );
 };
 
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index c41c537b1f40..1853bc9da09a 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -66,7 +66,7 @@ private:
     Timer                               maTimer;
     std::unique_ptr< ScChartLockGuard >   mapScChartLockGuard;
 
-    DECL_LINK(TimeoutHdl, void *);
+    DECL_LINK_TYPED(TimeoutHdl, Timer *, void);
 
     ScTemporaryChartLock( const ScTemporaryChartLock& ) SAL_DELETED_FUNCTION;
 };
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 30c1106669e0..66b0532e404e 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -214,7 +214,7 @@ public:
     };
 
 private:
-    Link<>      aRefreshHandler;
+    Link<Timer *, void> aRefreshHandler;
     ScDocument* pDoc;
     sal_uInt16 nEntryIndex;         ///< counter for unique indices
     NamedDBs maNamedDBs;
@@ -246,9 +246,9 @@ public:
     sal_uInt16  GetEntryIndex()                 { return nEntryIndex; }
     void    SetEntryIndex(sal_uInt16 nInd)      { nEntryIndex = nInd; }
 
-    void            SetRefreshHandler( const Link<>& rLink )
+    void            SetRefreshHandler( const Link<Timer *, void>& rLink )
                         { aRefreshHandler = rLink; }
-    const Link<>&   GetRefreshHandler() const   { return aRefreshHandler; }
+    const Link<Timer *, void>& GetRefreshHandler() const { return aRefreshHandler; }
 
     bool empty() const;
     bool operator== (const ScDBCollection& r) const;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 8f680e50d1fc..76e09e47e6e3 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -839,7 +839,7 @@ private:
     bool mbDocTimerEnabled:1;
 
     AutoTimer maSrcDocTimer;
-    DECL_LINK(TimeOutHdl, AutoTimer*);
+    DECL_LINK_TYPED(TimeOutHdl, Timer*, void);
 };
 
 #endif
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 2eed9833d7ee..46c48df1445e 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -54,7 +54,7 @@ public:
     bool operator!=( const ScRefreshTimer& r ) const;
 
     void SetRefreshControl( ScRefreshTimerControl * const * pp );
-    void SetRefreshHandler( const Link<>& rLink );
+    void SetRefreshHandler( const Link<Timer *, void>& rLink );
     sal_uLong GetRefreshDelay() const;
     void StopRefreshTimer();
 
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index f51949b0596e..82ea4e3edacd 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -131,7 +131,7 @@ public:
 
                         // moved by the application
 
-    DECL_LINK( IdleHandler, void* );   // Timer instead of idle
+    DECL_LINK_TYPED( IdleHandler, Timer*, void ); // Timer instead of idle
     DECL_LINK( SpellTimerHdl, void* );
     DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
 
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 3296c76b22a5..823bec4a3b3e 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -66,7 +66,7 @@ public:
 
     bool    IsUsed() const;
 
-    DECL_LINK( RefreshHdl, void* );
+    DECL_LINK_TYPED( RefreshHdl, Timer*, void );
     DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* );
 };
 
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index 9d07d881a218..82b82400b7ae 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -174,10 +174,9 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >&
         mapScChartLockGuard->AlsoLockThisChart( xModel );
 }
 
-IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ScTemporaryChartLock, TimeoutHdl, Timer *, void)
 {
     mapScChartLockGuard.reset();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 1a4bf179445e..ce73a0edbe72 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -89,7 +89,7 @@ void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp )
     ppControl = pp;
 }
 
-void ScRefreshTimer::SetRefreshHandler( const Link<>& rLink )
+void ScRefreshTimer::SetRefreshHandler( const Link<Timer *, void>& rLink )
 {
     SetTimeoutHdl( rLink );
 }
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index caf2c4a98373..fdfe240a0044 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3605,7 +3605,7 @@ void ScInputHandler::ResetDelayTimer()
     }
 }
 
-IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
+IMPL_LINK_TYPED( ScInputHandler, DelayTimer, Timer*, pTimer, void )
 {
     if ( pTimer == pDelayTimer )
     {
@@ -3640,7 +3640,6 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
             }
         }
     }
-    return 0;
 }
 
 void ScInputHandler::InputSelection( EditView* pView )
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index a31b5280faa2..4a5cf93dc110 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1871,12 +1871,12 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell )
     }
 }
 
-IMPL_LINK_NOARG(ScModule, IdleHandler)
+IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void)
 {
     if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) )
     {
         aIdleTimer.Start(); // Timeout unchanged
-        return 0;
+        return;
     }
 
     bool bMore = false;
@@ -1940,7 +1940,6 @@ IMPL_LINK_NOARG(ScModule, IdleHandler)
 
 
     aIdleTimer.Start();
-    return 0;
 }
 
 IMPL_LINK_NOARG(ScModule, SpellTimerHdl)
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index c0cce308978e..651008c50bb1 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -64,10 +64,9 @@ void ScMenuFloatingWindow::SubMenuItemData::reset()
     maTimer.Stop();
 }
 
-IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void)
 {
     mpParent->handleMenuTimeout(this);
-    return 0;
 }
 
 size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 8ac10bee2fa3..c6f226689276 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -758,7 +758,7 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl)
     return 0;
 }
 
-IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer )
+IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void )
 {
     // Check if RefInputMode is still true every 50ms
 
@@ -767,8 +767,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer )
 
     if ( pExpander->get_expanded() )
         pTimer->Start();
-
-    return 0;
 }
 
 IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 9e1fe0af342b..b4c33ef08be6 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -482,10 +482,9 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter,
     return bCanDo;
 }
 
-IMPL_LINK_NOARG(ScAreaLink, RefreshHdl)
+IMPL_LINK_NOARG_TYPED(ScAreaLink, RefreshHdl, Timer *, void)
 {
-    return long(
-        Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ));
+    Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() );
 }
 
 IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl)
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 4c2ea196b80a..37f139347c41 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -205,14 +205,12 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow )      // Sekunden
     nTimerStart = nNow;
 }
 
-IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl)
+IMPL_LINK_NOARG_TYPED(ScAutoStyleList, TimerHdl, Timer *, void)
 {
     sal_uLong nNow = TimeNow();
     AdjustEntries(aTimer.GetTimeout());             // eingestellte Wartezeit
     ExecuteEntries();
     StartTimer(nNow);
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 1aaf8e19eddd..e2ab9701b4a3 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -586,12 +586,10 @@ bool DataStream::ImportData()
     return mbRunning;
 }
 
-IMPL_LINK_NOARG(DataStream, ImportTimerHdl)
+IMPL_LINK_NOARG_TYPED(DataStream, ImportTimerHdl, Timer *, void)
 {
     if (ImportData())
         maImportTimer.Start();
-
-    return 0;
 }
 
 } // namespace sc
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index f95815389e66..8ef2a76112f9 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -976,11 +976,10 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec
     return true;
 }
 
-IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
+IMPL_LINK_TYPED( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void )
 {
     ScDBDocFunc aFunc(*this);
 
-    bool bContinue = true;
     ScDBData* pDBData = static_cast<ScDBData*>(pRefreshTimer);
     ScImportParam aImportParam;
     pDBData->GetImportParam( aImportParam );
@@ -988,7 +987,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
     {
         ScRange aRange;
         pDBData->GetArea( aRange );
-        bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, NULL, true, false ); //! Api-Flag as parameter
+        bool bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, NULL, true, false ); //! Api-Flag as parameter
         // internal operations (sort, query, subtotal) only if no error
         if (bContinue)
         {
@@ -996,8 +995,6 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
             RefreshPivotTables(aRange);
         }
     }
-
-    return long(bContinue);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 85bcad965b24..5e8c66e8d96e 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -3036,12 +3036,10 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-IMPL_LINK(ScExternalRefManager, TimeOutHdl, AutoTimer*, pTimer)
+IMPL_LINK_TYPED(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void)
 {
     if (pTimer == &maSrcDocTimer)
         purgeStaleSrcDocument(SRCDOC_LIFE_SPAN);
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 4b7ff828e66d..742b79a24a0c 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -414,9 +414,9 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter,
     return true;
 }
 
-IMPL_LINK_NOARG(ScTableLink, RefreshHdl)
+IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void)
 {
-    return long(Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ));
+    Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() );
 }
 
 IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink )
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index ac4b97811d3e..7f1a01bd40a5 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -126,15 +126,13 @@ void FuPoor::ForceScroll(const Point& aPixPos)
 |*
 \************************************************************************/
 
-IMPL_LINK_NOARG(FuPoor, ScrollHdl)
+IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void)
 {
     Point aPosPixel = pWindow->GetPointerPosPixel();
 
     // use remembered MouseButton state to create correct
     // MouseEvents for this artificial MouseMove.
     MouseMove(MouseEvent(aPosPixel, 1, MouseEventModifiers::NONE, GetMouseButtonCode()));
-
-    return 0;
 }
 
 // moved from inline to *.cxx
@@ -201,7 +199,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
 |* Timer-Handler fuer Drag&Drop
 |*
 \************************************************************************/
-IMPL_LINK_NOARG(FuPoor, DragTimerHdl)
+IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void)
 {
     //  ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer
     //  aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei
@@ -211,7 +209,6 @@ IMPL_LINK_NOARG(FuPoor, DragTimerHdl)
     //  Darum Drag&Drop aus eigenem Event:
 
     Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) );
-    return 0;
 }
 
 IMPL_LINK_NOARG(FuPoor, DragHdl)
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index edfc6468ffb0..b1659f5b4438 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -44,7 +44,7 @@ private:
     void    ExecuteEntries();
     void    AdjustEntries(sal_uLong nDiff);
     void    StartTimer(sal_uLong nNow);
-    DECL_LINK( TimerHdl, void* );
+    DECL_LINK_TYPED( TimerHdl, Timer*, void );
     DECL_LINK( InitHdl, void* );
 
 public:
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 7b09474462c2..27a297c5cf51 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -162,7 +162,7 @@ private:
         VclPtr<ScMenuFloatingWindow>   mpSubMenu;
         size_t                  mnMenuPos;
 
-        DECL_LINK( TimeoutHdl, void* );
+        DECL_LINK_TYPED( TimeoutHdl, Timer*, void );
 
         SubMenuItemData(ScMenuFloatingWindow* pParent);
         void reset();
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 03baa2fad810..bfe172017326 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -100,7 +100,7 @@ private:
     void Text2Doc();
     void Refresh();
 
-    DECL_LINK( ImportTimerHdl, void* );
+    DECL_LINK_TYPED( ImportTimerHdl, Timer*, void );
 
 private:
     ScDocShell* mpDocShell;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index f103f12c4de0..8eba21ac633f 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -408,7 +408,7 @@ public:
     static OUString   GetDifFilterName();
     static bool       HasAutomaticTableName( const OUString& rFilter );
 
-    DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
+    DECL_LINK_TYPED( RefreshDBDataHdl, Timer*, void );
 
     void            BeforeXMLLoading();
     void            AfterXMLLoading(bool bRet);
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 44d48c228524..e7cdc96ee775 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -155,7 +155,7 @@ private:
     DECL_LINK( MoreExpandedHdl, void* );
 
     // Hack: RefInput control
-    DECL_LINK( TimeOutHdl,   Timer* );
+    DECL_LINK_TYPED( TimeOutHdl, Timer*, void );
 };
 
 class ScSpecialFilterDlg : public ScAnyRefDlg
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index d6edc1c4c73b..6ea7f7602a4e 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -50,11 +50,11 @@ protected:
     VclPtr<Dialog>          pDialog;
 
     Timer           aScrollTimer;           // for Autoscrolling
-    DECL_LINK( ScrollHdl, void * );
+    DECL_LINK_TYPED( ScrollHdl, Timer *, void );
     void ForceScroll(const Point& aPixPos);
 
     Timer           aDragTimer;             // for Drag&Drop
-    DECL_LINK( DragTimerHdl, void * );
+    DECL_LINK_TYPED( DragTimerHdl, Timer *, void );
     DECL_LINK( DragHdl, void * );
     bool            bIsInDragMode;
     Point           aMDPos;                 // Position of MouseButtonDown
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index e5820b8ed39d..5b0e83728976 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -136,7 +136,7 @@ private:
     void            UpdateFormulaMode();
     static void     InvalidateAttribs();
     void            ImplCreateEditEngine();
-    DECL_LINK(      DelayTimer, Timer* );
+    DECL_LINK_TYPED( DelayTimer, Timer*, void );
     void            GetColData();
     void            UseColData();
     void            NextAutoEntry( bool bBack );
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 64bc24f5bc17..8655f0d74528 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -96,7 +96,7 @@ private:
     DECL_LINK(SelectHdl_Impl, void *);
     DECL_LINK(CountHdl_Impl, void *);
     DECL_LINK(DoEnterHdl, void *);
-    DECL_LINK(BrowseTimeoutHdl, void *);
+    DECL_LINK_TYPED(BrowseTimeoutHdl, Timer *, void);
     DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
 };
 
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index ee8af56338f0..4daa0d387abd 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -49,7 +49,7 @@ private:
     SdrObject*      pObject;
     bool            bVisible;
     Point           aGridOff;
-    DECL_LINK( TimeHdl, void* );
+    DECL_LINK_TYPED( TimeHdl, Timer*, void );
 
 public:
                 ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal,
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 7b00360bcfd1..d7e2a2dbf12e 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -177,7 +177,7 @@ private:
     void            DoHSplit(long nSplitPos);
     void            DoVSplit(long nSplitPos);
 
-    DECL_LINK(      TimerHdl, void* );
+    DECL_LINK_TYPED( TimerHdl, Timer*, void );
 
     void            UpdateVarZoom();
 
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 27825d3198a9..13e3c3b17387 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -317,11 +317,10 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void)
 {
     bMustClose = true;
     BrowseHdl_Impl(m_pBtnBrowse);
-    return 0;
 }
 
 IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 12ed0678ce46..d04644eb13ac 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -71,7 +71,7 @@ ScNoteMarker::~ScNoteMarker()
     delete pModel;
 }
 
-IMPL_LINK_NOARG(ScNoteMarker, TimeHdl)
+IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void)
 {
     if (!bVisible)
     {
@@ -109,7 +109,6 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl)
     }
 
     Draw();
-    return 0;
 }
 
 static void lcl_DrawWin( SdrObject* pObject, vcl::Window* pWindow, const MapMode& rMap )
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 961cf7f6f050..a6c008ebce49 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -269,12 +269,10 @@ void ScTabView::ResetTimer()
     pTimerWindow = NULL;
 }
 
-IMPL_LINK_NOARG(ScTabView, TimerHdl)
+IMPL_LINK_NOARG_TYPED(ScTabView, TimerHdl, Timer *, void)
 {
     if (pTimerWindow)
         pTimerWindow->MouseMove( aTimerMEvt );
-
-    return 0;
 }
 
 // --- Resize ---------------------------------------------------------------------