Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

28 files changed, 48 insertions, 67 deletions

diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 2df8af397dbf..94038132f123 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -246,7 +246,7 @@ class SwHTMLTableLayout
 
     void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false );
 
-    DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* );
+    DECL_STATIC_LINK_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void );
 
     static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc );
 public:
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 60282bf0ce52..8f135031bb52 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -72,7 +72,7 @@ class SwChartLockController_Helper
 {
     SwDoc   *pDoc;
 
-    DECL_LINK( DoUnlockAllCharts, Timer * );
+    DECL_LINK_TYPED( DoUnlockAllCharts, Timer *, void );
     Timer   aUnlockTimer;   // timer to unlock chart controllers
     bool    bIsLocked;
 
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 8677456f9da2..5f231eca35fd 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -225,7 +225,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
     return nChars < 0;
 }
 
-IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer )
+IMPL_LINK_TYPED( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void )
 {
     (void)pTimer;
     if (IncrementalDocStatCalculate(32000))
@@ -234,7 +234,6 @@ IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer )
     SwView* pView = m_rDoc.GetDocShell() ? m_rDoc.GetDocShell()->GetView() : NULL;
     if( pView )
         pView->UpdateDocStats();
-    return 0;
 }
 
 DocumentStatisticsManager::~DocumentStatisticsManager()
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 3f2412de76a6..e9169755b77f 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1744,13 +1744,11 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc )
         pRoot->EndAllAction( true );    //True per VirDev (browsing is calmer)
 }
 
-IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
+IMPL_STATIC_LINK_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, EMPTYARG, void )
 {
     pThis->aResizeTimer.Stop();
     pThis->_Resize( pThis->nDelayedResizeAbsAvail,
                     pThis->bDelayedResizeRecalc );
-
-    return 0;
 }
 
 bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx
index 45915c77ecde..be1e78a84b35 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -60,7 +60,7 @@ private:
     bool IncrementalDocStatCalculate(long nChars, bool bFields = true);
 
     // Our own 'StatsUpdateTimer' calls the following method
-    DECL_LINK( DoIdleStatsUpdate, Timer * );
+    DECL_LINK_TYPED( DoIdleStatsUpdate, Timer *, void );
 
 
     SwDocStat       *mpDocStat;          //< Statistics information.
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index eb2914ea8887..95316316ba1f 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -73,7 +73,7 @@ public:
     SwBlink();
     ~SwBlink();
 
-    DECL_LINK( Blinker, void * );
+    DECL_LINK_TYPED( Blinker, Timer *, void );
 
     void Insert( const Point& rPoint, const SwLinePortion* pPor,
                  const SwTxtFrm *pTxtFrm, sal_uInt16 nDir );
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 52c720ae0e8f..8bdd175f98d7 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -55,7 +55,7 @@ SwBlink::~SwBlink( )
  * Toggle visibility flag
  * Determine the repaint rectangle and invalidate them in their OleShells.
  */
-IMPL_LINK_NOARG(SwBlink, Blinker)
+IMPL_LINK_NOARG_TYPED(SwBlink, Blinker, Timer *, void)
 {
     bVisible = !bVisible;
     if( bVisible )
@@ -113,7 +113,6 @@ IMPL_LINK_NOARG(SwBlink, Blinker)
     }
     else // If the list is empty, the timer can be stopped
         aTimer.Stop();
-    return 1;
 }
 
 void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor,
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index 6c3c3dcbd6a9..caa60485b010 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -44,7 +44,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient
     SwGrammarMarkUp *mpProxyList;
     bool mbFinished;
     SwTxtNode* getMyTxtNode() { return static_cast<SwTxtNode*>(GetRegisteredIn()); }
-      DECL_LINK( TimerRepaint, Timer * );
+      DECL_LINK_TYPED( TimerRepaint, Timer *, void );
 
 public:
     SwGrammarContact();
@@ -65,7 +65,7 @@ SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false )
     aTimer.SetTimeoutHdl( LINK(this, SwGrammarContact, TimerRepaint) );
 }
 
-IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer )
+IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void )
 {
     if( pTimer )
     {
@@ -77,7 +77,6 @@ IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer )
             SwTxtFrm::repaintTextFrames( *getMyTxtNode() );
         }
     }
-    return 0;
 }
 
 /* I'm always a client of the current paragraph */
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index deaa196bf449..ba53b5ecd7cb 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -160,10 +160,9 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock )
     bIsLocked = bLock;
 }
 
-IMPL_LINK( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, /*pTimer*/ )
+IMPL_LINK_NOARG_TYPED( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void )
 {
     UnlockAllCharts();
-    return 0;
 }
 
 static osl::Mutex &    GetChartMutex()
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 78d24ba09cb7..3f8b5686b08a 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -510,7 +510,7 @@ void SwHeaderFooterWin::Select( )
     ExecuteCommand( GetCurItemId() );
 }
 
-IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler)
+IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void)
 {
     if ( m_bIsAppearing && m_nFadeRate > 0 )
         m_nFadeRate -= 25;
@@ -532,8 +532,6 @@ IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler)
 
     if ( IsVisible( ) && m_nFadeRate > 0 && m_nFadeRate < 100 )
         m_aFadeTimer.Start();
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 23b5902bc906..0840c825261c 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -441,14 +441,14 @@ IMPL_LINK_NOARG(SwPageBreakWin, HideHandler)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler)
+IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void)
 {
     const int TICKS_BEFORE_WE_APPEAR = 10;
     if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR )
     {
         ++m_nDelayAppearing;
         m_aFadeTimer.Start();
-        return 0;
+        return;
     }
 
     if ( m_bIsAppearing && m_nFadeRate > 0 )
@@ -468,8 +468,6 @@ IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler)
 
     if ( IsVisible( ) && m_nFadeRate > 0 && m_nFadeRate < 100 )
         m_aFadeTimer.Start();
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index e3d86869daac..72dea948881c 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -475,7 +475,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
     return DND_ACTION_NONE;
 }
 
-IMPL_LINK_NOARG(SwEditWin, DDHandler)
+IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void)
 {
     g_bDDTimerStarted = false;
     m_aTimer.Stop();
@@ -489,7 +489,6 @@ IMPL_LINK_NOARG(SwEditWin, DDHandler)
         g_bExecuteDrag = true;
         StartExecuteDrag();
     }
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 4a8d91b7e401..58957e2aeede 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -593,7 +593,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
 /**
  * Increase timer for selection
  */
-IMPL_LINK_NOARG(SwEditWin, TimerHandler)
+IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void)
 {
     SwWrtShell &rSh = m_rView.GetWrtShell();
     Point aModPt( m_aMovePos );
@@ -642,7 +642,6 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler)
 
     m_aMovePos += rSh.VisArea().Pos() - aOldVis.Pos();
     JustifyAreaTimer();
-    return 0;
 }
 
 void SwEditWin::JustifyAreaTimer()
@@ -5729,16 +5728,14 @@ static SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType )
     return pShell;
 }
 
-IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler)
+IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void)
 {
     FlushInBuffer();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler)
+IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void)
 {
     m_bTblInsDelMode = false;
-    return 0;
 }
 
 void SwEditWin::_InitStaticData()
diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx
index 8e90321f1979..a027814fa755 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -46,11 +46,9 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId)
     m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl));
 }
 
-IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl)
+IMPL_LINK_NOARG_TYPED(SwChildWinWrapper, UpdateHdl, Timer *, void)
 {
     GetWindow()->Activate();    // update dialog
-
-    return 0;
 }
 
 // newly initialise dialog after Doc switch
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index 76241f648c98..b9fa86e4a5c6 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -51,7 +51,7 @@ public:
     void SetReadonly( bool bReadonly ) SAL_OVERRIDE;
 
 private:
-    DECL_LINK( FadeHandler, void * );
+    DECL_LINK_TYPED( FadeHandler, Timer *, void );
 };
 
 #endif
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index ab18dd86c4d9..d2c165e043b1 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -56,7 +56,7 @@ public:
 private:
     /// Hide the button (used when the popup menu is closed by clicking outside)
     DECL_LINK( HideHandler, void * );
-    DECL_LINK( FadeHandler, void * );
+    DECL_LINK_TYPED( FadeHandler, Timer *, void );
 };
 
 #endif
diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx
index d9b6574b099c..ac457f1f8a31 100644
--- a/sw/source/uibase/inc/chldwrap.hxx
+++ b/sw/source/uibase/inc/chldwrap.hxx
@@ -29,7 +29,7 @@ class SwChildWinWrapper : public SfxChildWindow
     Timer       m_aUpdateTimer;
     SwDocShell* m_pDocSh;
 
-    DECL_LINK( UpdateHdl, void* );
+    DECL_LINK_TYPED( UpdateHdl, Timer*, void );
 
     // Implementation in fldtdlg.cxx
 protected:
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index ee23a095d861..faf669d7136a 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -191,7 +191,7 @@ public:
     SwWrtShell*         GetHiddenWrtShell() {return pHiddenShell;}
 
     DECL_LINK( ContentDoubleClickHdl, void * );
-    DECL_LINK( TimerUpdate, void * );
+    DECL_LINK_TYPED( TimerUpdate, Timer *, void );
 
     virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE;
     virtual void    RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
@@ -294,7 +294,7 @@ protected:
     void            Clear();
 
     DECL_LINK(      PopupHdl, Menu* );
-    DECL_LINK(      Timeout, void* );
+    DECL_LINK_TYPED( Timeout, Timer*, void );
     DECL_LINK(      DoubleClickHdl, void* );
 
     bool            IsInternalDrag() const {return bIsInternalDrag;}
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index aa9e84873dfd..a0365836c4e7 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -165,16 +165,16 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
      * The selection is regularly increased towards the mouse
      * position.
      */
-    DECL_LINK( TimerHandler, void * );
+    DECL_LINK_TYPED( TimerHandler, Timer *, void );
     void            StartDDTimer();
     void            StopDDTimer(SwWrtShell *, const Point &);
-    DECL_LINK( DDHandler, void * );
+    DECL_LINK_TYPED( DDHandler, Timer *, void );
 
     // timer for ANY-KeyInut question without a following KeyInputEvent
-    DECL_LINK( KeyInputFlushHandler, void * );
+    DECL_LINK_TYPED( KeyInputFlushHandler, Timer *, void );
 
     // timer for overlapping KeyInputs (e.g. for tables)
-    DECL_LINK( KeyInputTimerHandler, void * );
+    DECL_LINK_TYPED( KeyInputTimerHandler, Timer *, void );
 
     // timer for ApplyTemplates via mouse (in disguise Drag&Drop)
     DECL_LINK( TemplateTimerHdl, void * );
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 7fb471182a7d..6c5aabb1465c 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -100,7 +100,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SAL_DLLPRIVATE DECL_LINK( UndoHdl,           void* );
     SAL_DLLPRIVATE DECL_LINK( DeselectHdl,       void* );
     SAL_DLLPRIVATE DECL_LINK( SelectHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK( GotoHdl,           void* );
+    SAL_DLLPRIVATE DECL_LINK_TYPED( SelectTimerHdl, Timer*, void );
+    SAL_DLLPRIVATE DECL_LINK_TYPED( GotoHdl, Timer*, void );
     SAL_DLLPRIVATE DECL_LINK( CommandHdl,        void* );
 
     SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, bool bChild);
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index 94c23771b8da..8f5fb4659af8 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -115,7 +115,7 @@ protected:
     Color GetFadedColor(const Color &rHighColor, const Color &rLowColor);
 
     /// Fade timer callback.
-    DECL_LINK(FadeHandler, void *);
+    DECL_LINK_TYPED(FadeHandler, Timer *, void);
 };
 
 #endif
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index 2eafa89c0461..0f5eb6cd9e6e 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -281,7 +281,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE void          CreateBtns();
     SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
 
-    SAL_DLLPRIVATE DECL_LINK( TimeoutHdl, void* );
+    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Timer*, void );
     SAL_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
 
     SAL_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* );
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 411febaeaae1..b8cac8b31b33 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -212,7 +212,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
 
     // avoid flickering of buttons:
     aDeselectTimer.SetTimeout(100);
-    aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectHdl));
+    aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectTimerHdl));
 
     // avoid multiple selection of the same texts:
     aSelectTimer.SetTimeout(100);
@@ -943,13 +943,17 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl)
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl)
 {
+    SelectTimerHdl(nullptr);
+    return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void)
+{
     aDeselectTimer.Stop();
     aSelectTimer.Start();
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl)
+IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void)
 {
     SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
     aSelectTimer.Stop();
@@ -1014,8 +1018,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl)
     pTPView->EnableAccept( bEnable && bSel /*&& !bReadonlySel*/ );
     pTPView->EnableReject( bEnable && bSel && bIsNotFormated /*&& !bReadonlySel*/ );
     pTPView->EnableRejectAll( bEnable && !bOnlyFormatedRedlines && !bHasReadonlySel );
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 748aa9ceccb6..b462d36cb2b1 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -289,7 +289,7 @@ Color SwCommentRuler::GetFadedColor(const Color &rHighColor, const Color &rLowCo
     return aColor;
 }
 
-IMPL_LINK_NOARG(SwCommentRuler, FadeHandler)
+IMPL_LINK_NOARG_TYPED(SwCommentRuler, FadeHandler, Timer *, void)
 {
     const int nStep = 25;
     if ( mbIsHighlighted && mnFadeRate < 100 )
@@ -297,13 +297,12 @@ IMPL_LINK_NOARG(SwCommentRuler, FadeHandler)
     else if ( !mbIsHighlighted && mnFadeRate > 0 )
         mnFadeRate -= nStep;
     else
-        return 0;
+        return;
 
     Invalidate();
 
     if ( mnFadeRate != 0 && mnFadeRate != 100)
         maFadeTimer.Start();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 085157fdf961..5a158033a097 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -517,12 +517,12 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwView, TimeoutHdl)
+IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void)
 {
     if( m_pWrtShell->BasicActionPend() || g_bNoInterrupt )
     {
         m_aTimer.Start();
-        return 0;
+        return;
     }
 
     if ( m_bAttrChgNotifiedWithRegistrations )
@@ -540,8 +540,6 @@ IMPL_LINK_NOARG(SwView, TimeoutHdl)
     m_pWrtShell->DoUndo( bOldUndo );
     m_bAttrChgNotified = false;
     GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
-
-    return 0;
 }
 
 void SwView::_CheckReadonlyState()
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 65d78e54fed0..d744d24c2630 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -211,7 +211,7 @@ namespace
 
     private:
         void implTakeOwnership( );
-        DECL_LINK( OnTryDeleteFile, void* );
+        DECL_LINK_TYPED( OnTryDeleteFile, Timer*, void );
     };
 
     DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile )
@@ -240,7 +240,7 @@ namespace
         osl_atomic_decrement( &m_refCount );
     }
 
-    IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile)
+    IMPL_LINK_NOARG_TYPED(DelayedFileDeletion, OnTryDeleteFile, Timer *, void)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -278,7 +278,6 @@ namespace
             aGuard.clear();
             release();  // this should be our last reference, we should be dead after this
         }
-        return 0L;
     }
 
     void DelayedFileDeletion::implTakeOwnership( )
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index f5a63c3dcab1..36ab74aa71a4 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2446,10 +2446,10 @@ void    SwContentTree::HideTree()
 
 // No idle with focus or while dragging.
 
-IMPL_LINK_NOARG(SwContentTree, TimerUpdate)
+IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void)
 {
     if (IsDisposed())
-        return 0;
+        return;
 
     // No update while drag and drop.
     // Query view because the Navigator is cleared too late.
@@ -2490,7 +2490,6 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate)
         Clear();
         bIsIdleClear = true;
     }
-    return 0;
 }
 
 DragDropMode SwContentTree::NotifyStartDrag(
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index a3fc721718d9..012a6fd02a6f 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1009,11 +1009,10 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
         delete pContCopy;
 }
 
-IMPL_LINK_NOARG(SwGlobalTree, Timeout)
+IMPL_LINK_NOARG_TYPED(SwGlobalTree, Timeout, Timer *, void)
 {
     if(!IsDisposed() && !HasFocus() && Update( false ))
         Display();
-    return 0;
 }
 
 void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont)