Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

22 files changed, 26 insertions, 24 deletions

diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 69549abf39cb..164c1bd7f34d 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -131,7 +131,8 @@ private:
                             const SfxPoolItem *pItem,
                             SfxItemState eItemState );
     SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos);
-    DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * );
+    DECL_DLLPRIVATE_LINK_TYPED( NextJob, Timer *, void );
+    SAL_DLLPRIVATE bool NextJob_Impl(Timer * pTimer);
 
 public:
                      SfxBindings();
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index cc87c68ce50f..f1245fe3e048 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -254,7 +254,7 @@ private:
 
 protected:
 
-    DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *);
+    DECL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer *, void );
 
 public:
                     Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 );
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 0c25f90bf587..35d63bc34776 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -315,7 +315,7 @@ private:
                                 bool                bEnlarge
                             ) const;
 
-                            DECL_LINK( ImplAutoSwapOutHdl, void* );
+                            DECL_LINK_TYPED( ImplAutoSwapOutHdl, Timer*, void );
 
     // restart SwapOut timer; this is like touching in a cache to reset to the full timeout value
     void SVT_DLLPRIVATE     restartSwapOutTimer() const;
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 33ae3657c4e2..34c081b64e16 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -56,7 +56,7 @@ private:
                     DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* );
                     DECL_DLLPRIVATE_LINK( ImplOptionsHdl, void* );
                     DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* );
-                    DECL_DLLPRIVATE_LINK( ImplStatusHdl, void* );
+                    DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void );
 
 public:
                     PrinterSetupDialog( vcl::Window* pWindow );
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 330db02ec858..b89bc1852cf6 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -268,7 +268,7 @@ private:
     SVT_DLLPRIVATE void         ImplTracking( const Point& rPos, bool bRepeat );
     SVT_DLLPRIVATE void         ImplEndTracking( const Point& rPos, bool bCancel );
     DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
-    DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
 
     ValueSet (const ValueSet &) SAL_DELETED_FUNCTION;
     ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION;
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 363f884d9f57..49f70d4d9752 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -46,7 +46,7 @@ public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
 private:
-    DECL_LINK( WaitDoubleClickHdl, void* );
+    DECL_LINK_TYPED( WaitDoubleClickHdl, Timer*, void );
     void impl_executePaintBrush();
 
 private:
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 8d2c1bfb6726..7c03abd975d9 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -41,7 +41,7 @@ class SvxLineBox : public LineLB
     SfxObjectShell* mpSh;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-                    DECL_LINK(DelayHdl_Impl, void *);
+                    DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void);
 
     void            ReleaseFocus_Impl();
 
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index ec241902877b..0ad7edb914fe 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -243,7 +243,7 @@ private:
     DECL_LINK(FormatHdl_Impl, void *);
     DECL_LINK(NoFormatHdl_Impl, void *);
     DECL_LINK(AttributeHdl_Impl, void *);
-    DECL_LINK( TimeoutHdl_Impl, Timer* );
+    DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void );
 
     void            Construct_Impl();
     void            InitControls_Impl();
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 16453d8ad16a..47d1dc67660b 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -202,7 +202,7 @@ class OLEObjCache
 
     void UnloadOnDemand();
     static bool UnloadObj( SdrOle2Obj* pObj );
-    DECL_LINK( UnloadCheckHdl, AutoTimer* );
+    DECL_LINK_TYPED( UnloadCheckHdl, Timer*, void );
 
 public:
     OLEObjCache();
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 0d89bc9c4f1b..74a527fc5c84 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -229,7 +229,7 @@ private:
     bool            mbIsWaiting;
 
     SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout );
-    DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void );
 
 };
 
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index eecbd0c0ca8a..c56ef3c4b0d9 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -25,6 +25,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
 
+class Timer;
 struct ImplCursorData;
 namespace vcl { class Window; }
 
@@ -53,7 +54,7 @@ private:
 public:
     SAL_DLLPRIVATE void         ImplDraw();
     SAL_DLLPRIVATE void         ImplRestore();
-    DECL_DLLPRIVATE_LINK(       ImplTimerHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
     SAL_DLLPRIVATE void         ImplShow( bool bDrawDirect = true );
     SAL_DLLPRIVATE void         ImplHide( bool bStopTimer );
     SAL_DLLPRIVATE void         ImplResume( bool bRestore = false );
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 3eb655ccd09b..8df899a34219 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -99,7 +99,7 @@ private:
 
     css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
 
-    DECL_DLLPRIVATE_LINK(      ImplUpdateDataHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateDataHdl, Timer*, void );
 
     SAL_DLLPRIVATE bool        ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const;
     SAL_DLLPRIVATE void        ImplInitEditData();
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 035e1fc82dc2..b89db354dc9e 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -45,7 +45,7 @@ private:
     Link<MenuButton *, void> maSelectHdl;
 
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
-    DECL_DLLPRIVATE_LINK(  ImplMenuTimeoutHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void );
 
                            MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION;
                            MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION;
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 71bda7168c3b..18efc600681c 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -86,7 +86,7 @@ private:
     SAL_DLLPRIVATE void         ImplDragThumb( const Point& rMousePos );
     SAL_DLLPRIVATE Size         getCurrentCalcSize() const;
     DECL_DLLPRIVATE_LINK(       ImplTimerHdl, Timer* );
-    DECL_DLLPRIVATE_LINK(       ImplAutoTimerHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void );
 
 public:
     explicit        ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT );
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 781527157607..d5b9ef572d28 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -91,7 +91,7 @@ private:
     sal_uLong               nUpdateInterval;
     sal_uInt16              nLockedMods;
     SelectionEngineFlags    nFlags;
-    DECL_DLLPRIVATE_LINK( ImpWatchDog, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImpWatchDog, Timer*, void );
 
     inline bool         ShouldDeselect( bool bModifierKey1 ) const;
                                 // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index 1e40c6d6f017..48c8b4e9463c 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -53,7 +53,7 @@ private:
     SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt );
     using Window::ImplInit;
     SAL_DLLPRIVATE void       ImplInit( vcl::Window* pParent, WinBits nStyle );
-    DECL_DLLPRIVATE_LINK(     ImplTimeout, Timer* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void );
 
 public:
     explicit        SpinButton( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 8060271d1777..bf4879b52425 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -51,7 +51,7 @@ protected:
     SAL_DLLPRIVATE void   ImplInit( vcl::Window* pParent, WinBits nStyle );
 
 private:
-    DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void );
     SAL_DLLPRIVATE void   ImplInitSpinFieldData();
     SAL_DLLPRIVATE void   ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
 
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index f7cbbedf62e2..2c986adc23f3 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -86,7 +86,7 @@ private:
     AutoTimer   maWaitTimer;
     ImageSet    meImageSet;
 
-    DECL_LINK( TimeOutHdl, void* );
+    DECL_LINK_TYPED( TimeOutHdl, Timer*, void );
 };
 
 #endif // INCLUDED_VCL_THROBBER_HXX
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index c1779ce04294..458ad4e52bc8 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -26,7 +26,7 @@
 class VCL_DLLPUBLIC Timer : public Scheduler
 {
 protected:
-    Link<>          maTimeoutHdl;          // Callback Link
+    Link<Timer *, void> maTimeoutHdl;          // Callback Link
     sal_uInt64      mnTimeout;
     bool            mbAuto;
 
@@ -43,8 +43,8 @@ public:
 
     /// Make it possible to associate a callback with this timer handler
     /// of course, you can also sub-class and override 'Invoke'
-    void            SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; }
-    const Link<>&   GetTimeoutHdl() const { return maTimeoutHdl; }
+    void            SetTimeoutHdl( const Link<Timer *, void>& rLink ) { maTimeoutHdl = rLink; }
+    const Link<Timer *, void>& GetTimeoutHdl() const { return maTimeoutHdl; }
     void            SetTimeout( sal_uInt64 nTimeoutMs );
     sal_uInt64      GetTimeout() const { return mnTimeout; }
     virtual void    Invoke() SAL_OVERRIDE;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 661ea918a641..076f4342f9c3 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -239,7 +239,7 @@ private:
     DECL_DLLPRIVATE_LINK(          ImplUpdateHdl, void* );
     DECL_DLLPRIVATE_LINK(          ImplResetAutoSizeTriesHdl, void* );
     DECL_DLLPRIVATE_LINK(          ImplCustomMenuListener, VclMenuEvent* );
-    DECL_DLLPRIVATE_LINK(          ImplDropdownLongClickHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED(    ImplDropdownLongClickHdl, Timer*, void );
 
                                    ToolBox (const ToolBox &) SAL_DELETED_FUNCTION;
                           ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 441edcd45bf4..12d03e14f512 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -43,7 +43,7 @@ private:
 
 protected:
 
-    DECL_LINK(      ImpUpdateDataHdl, void* );
+    DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void );
     void            StateChanged( StateChangedType nType ) SAL_OVERRIDE;
     void            DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ccee88b2c20d..a3012e79455f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -426,7 +426,7 @@ public:
 
     DECL_DLLPRIVATE_LINK(      ImplHandlePaintHdl, void* );
     DECL_DLLPRIVATE_LINK(      ImplGenerateMouseMoveHdl, void* );
-    DECL_DLLPRIVATE_LINK(      ImplTrackTimerHdl, Timer* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
     DECL_DLLPRIVATE_LINK(      ImplAsyncFocusHdl, void* );
     DECL_DLLPRIVATE_LINK(      ImplHandleResizeTimerHdl, void* );
     DECL_DLLPRIVATE_LINK(      ImplHideOwnerDrawWindowsHdl, void* );