9 files changed, 10 insertions, 21 deletions
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index be2222c2ef3a..0fa73d6f184f 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -520,10 +520,9 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
 
 
 
-IMPL_LINK_NOARG(BrowserDataWin, RepeatedMouseMove)
+IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void)
 {
     GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) );
-    return 0;
 }
 
 void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt )
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 27b1eb10a218..8374e5e50b53 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -146,7 +146,7 @@ public:
     virtual void    Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
     virtual void    MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
     virtual void    MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE;
-                    DECL_LINK( RepeatedMouseMove, void * );
+                    DECL_LINK_TYPED( RepeatedMouseMove, Timer *, void );
 
     virtual void    MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE;
     virtual void    KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 9a3b13b239ae..4d1ba9f0ad05 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -221,7 +221,7 @@ public:
 
     Reference< XCommandEnvironment >    GetCommandEnvironment() const { return mxCmdEnv; }
 
-    DECL_LINK(ResetQuickSearch_Impl, void *);
+    DECL_LINK_TYPED(ResetQuickSearch_Impl, Timer *, void);
 
     virtual PopupMenu*  CreateContextMenu() SAL_OVERRIDE;
     virtual void        ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) SAL_OVERRIDE;
@@ -662,14 +662,12 @@ void ViewTabListBox_Impl::dispose()
 
 
 
-IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl)
+IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void)
 {
     ::osl::MutexGuard aGuard( maMutex );
 
     maQuickSearchText.clear();
     mnSearchIndex = 0;
-
-    return 0;
 }
 
 
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index ba2eac4b0959..051c71db7320 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1404,7 +1404,7 @@ void Calendar::ImplEndTracking( bool bCancel )
 
 
 
-IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG )
+IMPL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer*, EMPTYARG, void )
 {
     bool bPrevIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0;
     bool bNextIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0;
@@ -1414,7 +1414,6 @@ IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG )
         pThis->ImplScroll( bPrevIn );
         pThis->mbScrollDateRange = false;
     }
-    return 0;
 }
 
 
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 26021bb2760a..bf0b654639df 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1114,10 +1114,9 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
     return 0;
 }
 
-IMPL_LINK_NOARG(ValueSet, ImplTimerHdl)
+IMPL_LINK_NOARG_TYPED(ValueSet, ImplTimerHdl, Timer *, void)
 {
     ImplTracking( GetPointerPosPixel(), true );
-    return 0;
 }
 
 void ValueSet::ImplTracking( const Point& rPos, bool bRepeat )
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index b83adb372489..957c64e39d9a 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -292,13 +292,11 @@ void PrinterSetupDialog::ImplSetInfo()
 
 
 
-IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl)
+IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void)
 {
     QueueInfo aInfo;
     ImplPrnDlgUpdateQueueInfo(m_pLbName, aInfo);
     m_pFiStatus->SetText( ImplPrnDlgGetStatusText( aInfo ) );
-
-    return 0;
 }
 
 
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 2faf23e4f401..80a39809f039 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -1236,7 +1236,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj )
     return pRet;
 }
 
-IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer )
+IMPL_LINK_TYPED( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void )
 {
     pTimer->Stop();
 
@@ -1261,8 +1261,6 @@ IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer )
     }
 
     pTimer->Start();
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index a1c990c08ea7..6164cb2b0085 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -51,7 +51,7 @@ private:
     GraphicCacheEntry*      ImplGetCacheEntry( const GraphicObject& rObj );
 
 
-                            DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer );
+                            DECL_LINK_TYPED( ReleaseTimeoutHdl, Timer* pTimer, void );
 
 public:
 
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 29fe3424b7ab..4d60d73ddcaf 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1055,7 +1055,7 @@ void GraphicObject::SetSwapState()
     }
 }
 
-IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
+IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void)
 {
     if( !IsSwappedOut() )
     {
@@ -1084,8 +1084,6 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
 
     if( mpSwapOutTimer )
         mpSwapOutTimer->Start();
-
-    return 0L;
 }
 
 SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )