Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

20 files changed, 20 insertions, 32 deletions

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 875b71b57fe3..e6ca100f7690 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -289,7 +289,7 @@ void SfxConfigFunctionListBox::MouseMove( const MouseEvent& )
 {
 }
 
-IMPL_LINK( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer)
+IMPL_LINK_TYPED( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer, void)
 /*  Description
     Timer-handler for showing a help-text. If the mouse pointer is
     still on the currently selected entry after the timer has run out,
@@ -297,7 +297,6 @@ IMPL_LINK( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer)
 */
 {
     (void)pTimer; // unused
-    return 0L;
 }
 
 void SfxConfigFunctionListBox::ClearAll()
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 7477032f1567..a3d6acf0e350 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -135,14 +135,13 @@ void SvxConfigFunctionListBox::MouseMove( const MouseEvent& rMEvt )
 }
 
 
-IMPL_LINK_NOARG(SvxConfigFunctionListBox, TimerHdl)
+IMPL_LINK_NOARG_TYPED(SvxConfigFunctionListBox, TimerHdl, Timer *, void)
 {
     aTimer.Stop();
     Point aMousePos = GetPointerPosPixel();
     SvTreeListEntry *pEntry = GetCurEntry();
     if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry )
         Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), GetHelpText( pEntry ) );
-    return 0L;
 }
 
 void SvxConfigFunctionListBox::ClearAll()
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index f7a063979589..77d1150f62b2 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -690,10 +690,9 @@ void FmSearchDialog::EnableControlPaint(bool bEnable)
         }
 }
 
-IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
+IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer *, void)
 {
     EnableControlPaint(true);
-    return 0L;
 }
 
 void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a4e9ea50b114..3a2ebf328db1 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1247,11 +1247,10 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
 
 
 
-IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void)
 {
     aPreviewTimer.Stop();
     DoPreview();
-    return 0L;
 }
 
 
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 42cac22e856b..0623a45ac372 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -165,13 +165,11 @@ void GraphicFilterDialog::dispose()
 }
 
 
-IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
 {
     maTimer.Stop();
     mpPreview->SetPreview(GetFilteredGraphic(mpPreview->GetScaledOriginal(),
         mpPreview->GetScaleX(), mpPreview->GetScaleY()));
-
-    return 0;
 }
 
 
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index fd9340d599b2..936c5f859d58 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
 |*
 |************************************************************************/
 
-IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void)
 {
     if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
                                   maStrURL.isEmpty() ||
@@ -294,8 +294,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl)
 
         LeaveWait();
     }
-
-    return 0L;
 }
 
 /*************************************************************************
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 860fa291d06c..82bb1384cb37 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -243,10 +243,9 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl)
 |*
 |************************************************************************/
 
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void)
 {
     RefreshMarkWindow();
-    return 0L;
 }
 
 /*************************************************************************
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 478559bf26b4..c6c3ad9d9ea8 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -107,7 +107,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox
     SfxGroupInfoArr_Impl aArr;
     SfxStylesInfo_Impl*  pStylesInfo;
 
-    DECL_LINK( TimerHdl, Timer* );
+    DECL_LINK_TYPED( TimerHdl, Timer*, void );
     virtual void  MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
 public:
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index f0717aa758e2..8d32d5e8d9fd 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -173,7 +173,7 @@ private:
 
     DECL_LINK( OnSearchProgress, FmSearchProgress* );
 
-    DECL_LINK( OnDelayedPaint, void* ); ///< see EnableSearchUI
+    DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI
 
     void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor );
 };
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 134b6533b33b..644cf4a6d767 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -289,7 +289,7 @@ class TPGalleryThemeProperties : public SfxTabPage
                         DECL_LINK( SelectThemeHdl, void* );
                         DECL_LINK( SelectFileTypeHdl, void* );
                         DECL_LINK( DClickFoundHdl, void* );
-                        DECL_LINK( PreviewTimerHdl, void* );
+                        DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
                         DECL_LINK(EndSearchProgressHdl, void *);
                         DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 0f2048862526..ca79d09918fd 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -73,7 +73,7 @@ private:
     Size            maSizePixel;
     bool            bIsBitmap;
 
-    DECL_LINK(ImplPreviewTimeoutHdl, void *);
+    DECL_LINK_TYPED(ImplPreviewTimeoutHdl, Timer *, void);
     DECL_LINK( ImplModifyHdl, void* p );
 
 protected:
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 1a79416ee305..ae50b065641c 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -103,7 +103,7 @@ class SvxGrfCropPage : public SfxTabPage
     DECL_LINK( CropLoseFocusHdl, MetricField * );
     DECL_LINK( CropModifyHdl, MetricField * );
     DECL_LINK(OrigSizeHdl, void *);
-    DECL_LINK(Timeout, void *);
+    DECL_LINK_TYPED(Timeout, Timer *, void);
 
     void            CalcZoom();
     void            CalcMinMaxBorder();
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 19c69ba16ba7..9214f8024a0f 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -49,7 +49,7 @@ private:
 
     DECL_LINK (LostFocusPathHdl_Impl,  void * ); ///< Combobox "path" lost its focus
 
-    DECL_LINK(TimeoutHdl_Impl      , void *);  ///< Handler for timer -timeout
+    DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout
 
     enum EPathType { Type_Unknown, Type_Invalid,
                      Type_ExistsFile, Type_File,
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 99f60cdca909..a9252e102ed9 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -54,7 +54,7 @@ private:
     DECL_LINK (LostFocusTargetHdl_Impl   , void * ); ///< Combobox "Target" lost its focus
     DECL_LINK (ModifiedTargetHdl_Impl    , void * ); ///< Contens of editfield "Target" modified
 
-    DECL_LINK(TimeoutHdl_Impl           , void *); ///< Handler for timer -timeout
+    DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout
 
 
     void    SetScheme(const OUString& rScheme);
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index dae84fea1d13..65e9f1aa56e2 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -152,7 +152,7 @@ private:
     DECL_LINK( ClickHdl_Impl, PushButton* );
     DECL_LINK( EditHdl_Impl, Edit* );
     DECL_LINK( OptHdl_Impl, void * );
-    DECL_LINK(TimeHdl_Impl, void *);
+    DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void);
 };
 
 #endif
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 625da381375e..e5fc99d201fc 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -341,7 +341,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
         DECL_LINK( SameLevelHdl_Impl, CheckBox * );
         DECL_LINK( BulColorHdl_Impl, ColorListBox* );
         DECL_LINK( BulRelSizeHdl_Impl, MetricField *);
-        DECL_LINK(PreviewInvalidateHdl_Impl, void *);
+        DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void);
 
         DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
 
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 0cfa71112b74..898314dd2c66 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -96,7 +96,7 @@ friend class SvxConfigGroupListBox;
     SvxGroupInfoArr_Impl            aArr;
     SvTreeListEntry*                    m_pDraggingEntry;
 
-    DECL_LINK(TimerHdl, void *);
+    DECL_LINK_TYPED(TimerHdl, Timer *, void);
     virtual void                    MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
 public:
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 035ddab252c1..645867a185b0 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -736,12 +736,11 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
     m_pZoomConstRB->Enable(bFound);
 }
 
-IMPL_LINK_NOARG(SvxGrfCropPage, Timeout)
+IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void)
 {
     DBG_ASSERT(pLastCropField,"Timeout ohne Feld?");
     CropHdl(pLastCropField);
     pLastCropField = 0;
-    return 0;
 }
 
 
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index be2ab716a598..2663c39e2f9d 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1567,10 +1567,9 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl )
     return 0;
 }
 
-IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void)
 {
     pLastActivWindow=NULL;
-    return 0;
 }
 
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 797a37dcf22b..2af50a74dd08 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1755,10 +1755,9 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void)
 {
     m_pPreviewWIN->Invalidate();
-    return 0;
 }
 
 IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )