Use typed Idle::SetIdleHdl Link

Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9

18 files changed, 22 insertions, 34 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0bb1c879789d..7969c6976c38 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -445,7 +445,7 @@ private:
 
     // CharTimer calls this method.
     void DoUpdateAllCharts();
-    DECL_LINK( DoUpdateModifiedOLE, Timer * );
+    DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void );
 
 public:
     SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool );
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx
index b7982a765ac7..210eb3689424 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -78,7 +78,7 @@ void DocumentTimerManager::StartBackgroundJobs()
         maIdle.Start();
 }
 
-IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle )
+IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
 {
 #ifdef TIMELOG
     static ::rtl::Logfile* pModLogFile = 0;
@@ -96,7 +96,7 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle )
             if( rSh.ActionPend() )
             {
                 pIdle->Start();
-                return 0;
+                return;
             }
         }
 
@@ -120,7 +120,7 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle )
 
                 // Defer the remaining work.
                 pIdle->Start();
-                return 0;
+                return;
             }
         }
 
@@ -136,7 +136,7 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle )
                  m_rDoc.getIDocumentFieldsAccess().IsExpFldsLocked() )
             {
                 pIdle->Start();
-                return 0;
+                return;
             }
 
             //  Action brackets!
@@ -165,7 +165,6 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle )
     if( pModLogFile && 1 != (long)pModLogFile )
         delete pModLogFile, static_cast<long&>(pModLogFile) = 1;
 #endif
-    return 0;
 }
 
 DocumentTimerManager::~DocumentTimerManager() {}
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index a92b2d242e11..43924035665f 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -772,7 +772,7 @@ void SwDoc::PrtOLENotify( bool bAll )
     }
 }
 
-IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
+IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *, void )
 {
     SwFEShell* pSh = static_cast<SwFEShell*>(GetEditShell());
     if( pSh )
@@ -806,7 +806,6 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
             delete pNodes;
         }
     }
-    return 0;
 }
 
 struct CompareSwPageDescName {
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 8003e9b30845..daa12c3cbeb8 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -202,7 +202,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData )
     return bThreadStarted;
 }
 
-IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread)
+IMPL_LINK_NOARG_TYPED(ThreadManager, TryToStartNewThread, Idle *, void)
 {
     osl::MutexGuard aGuard(maMutex);
 
@@ -220,8 +220,6 @@ IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread)
             }
         }
     }
-
-    return sal_True;
 }
 
 void ThreadManager::ResumeStartingOfThreads()
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx
index 7bff0403276c..29d93b1b3d66 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -50,7 +50,7 @@ public:
     void StartBackgroundJobs() SAL_OVERRIDE;
 
     // Our own 'IdleTimer' calls the following method
-    DECL_LINK( DoIdleJobs, Idle * );
+    DECL_LINK_TYPED( DoIdleJobs, Idle *, void );
 
     virtual ~DocumentTimerManager();
 
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 0c6e827674ab..781821d2ac5e 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -71,7 +71,7 @@ class ThreadManager : public IThreadListenerOwner
         void RemoveThread( const oslInterlockedCount nThreadID,
                            const bool bThreadFinished = false );
 
-        DECL_LINK( TryToStartNewThread, void* );
+        DECL_LINK_TYPED( TryToStartNewThread, Idle*, void );
 
         /** suspend the starting of threads
 
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 470a72e04689..6ca57d1f1c93 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -182,7 +182,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
     SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
     SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
     SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* );
+    SAL_DLLPRIVATE DECL_STATIC_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, void );
 
     SAL_DLLPRIVATE void        IterateMails();
     SAL_DLLPRIVATE void        SendMails();
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 4b7bbfe27794..72c84ccd66df 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -397,7 +397,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog*
     return 0;
 }
 
-IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
+IMPL_STATIC_LINK_TYPED( SwSendMailDialog, RemoveThis, Idle*, pTimer, void )
 {
     if( pThis->m_pImpl->xMailDispatcher.is() )
     {
@@ -417,7 +417,6 @@ IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
     {
         pTimer->Start();
     }
-    return 0;
 }
 
 IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index cba7b7082166..be2171bdde8e 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -385,14 +385,12 @@ IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl)
 }
 
 // Invalidate preview
-IMPL_LINK_NOARG(SwLabFmtPage, PreviewHdl)
+IMPL_LINK_NOARG_TYPED(SwLabFmtPage, PreviewHdl, Idle *, void)
 {
     aPreviewIdle.Stop();
     ChangeMinMax();
     FillItem( aItem );
     m_pPreview->UpdateItem( aItem );
-
-    return 0;
 }
 
 // LoseFocus-Handler: Update on change
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index c81acc1b2180..9b409be04aab 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -90,7 +90,7 @@ class SwLabFmtPage : public SfxTabPage
     SwLabItem    aItem;
 
     DECL_LINK(ModifyHdl, void *);
-    DECL_LINK(PreviewHdl, void *);
+    DECL_LINK_TYPED(PreviewHdl, Idle *, void);
     DECL_LINK( LoseFocusHdl, Control * );
     DECL_LINK(SaveHdl, void *);
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 700f9489b58b..df4cf18118c7 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5761,10 +5761,9 @@ void SwEditWin::StopQuickHelp()
         m_pQuickHlpData->Stop( m_rView.GetWrtShell() );
 }
 
-IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl)
+IMPL_LINK_NOARG_TYPED(SwEditWin, TemplateTimerHdl, Idle *, void)
 {
     SetApplyTemplate(SwApplyTemplate());
-    return 0;
 }
 
 void SwEditWin::SetChainMode( bool bOn )
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 02e1e66b1093..b6776f23456e 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -578,7 +578,7 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
     return 0;
 }
 
-IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle )
+IMPL_LINK_TYPED( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void )
 {
     tools::Time aSyntaxCheckStart( tools::Time::SYSTEM );
     SAL_WARN_IF(pTextView == 0, "sw", "No View yet, but syntax highlighting?!");
@@ -631,8 +631,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle )
     if ( nCurTextWidth != nPrevTextWidth )
         SetScrollBarRanges();
     bHighlighting = false;
-
-    return 0;
 }
 
 void SwSrcEditWindow::DoSyntaxHighlight( sal_uInt16 nPara )
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 1fb8f2de9378..a24dd4fa486d 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -177,7 +177,7 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
     DECL_LINK_TYPED( KeyInputTimerHandler, Timer *, void );
 
     // timer for ApplyTemplates via mouse (in disguise Drag&Drop)
-    DECL_LINK( TemplateTimerHdl, void * );
+    DECL_LINK_TYPED( TemplateTimerHdl, Idle *, void );
 
     using OutputDevice::GetTextColor;
 
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 1cb6b9fe021d..c24e446a77fc 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -108,7 +108,7 @@ class SwNavigationPI : public vcl::Window,
     DECL_LINK( EditGetFocus, NumEditAction * );
     DECL_LINK( DoneLink, SfxPoolItem * );
     DECL_LINK( MenuSelectHdl, Menu * );
-    DECL_LINK( ChangePageHdl, void* );
+    DECL_LINK_TYPED( ChangePageHdl, Idle*, void );
     DECL_LINK( PageEditModifyHdl, void* );
     DECL_LINK( PopupModeEndHdl, void * );
     DECL_LINK( ClosePopupWindow, SfxPopupWindow * );
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 55e53f4fb9da..88971bf01274 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -95,7 +95,7 @@ private:
     using OutputDevice::SetFont;
     void            SetFont();
 
-    DECL_LINK( SyntaxTimerHdl, Idle * );
+    DECL_LINK_TYPED( SyntaxTimerHdl, Idle *, void );
     DECL_LINK( TimeoutHdl, Timer * );
 
     using Window::Notify;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 36ffb80ba680..64dc616b5546 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
 
     static  bool    bShowServiceNotAvailableMessage;
 
-    SAL_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* );
+    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Idle*, void );
     SAL_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
 
     SAL_DLLPRIVATE void  CreateControl();
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 663ebe73b67d..1c99755c8408 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1250,14 +1250,13 @@ bool    SwNavigationPI::IsGlobalDoc() const
     return bRet;
 }
 
-IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl)
+IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void)
 {
     if (!IsDisposed())
     {
         EditAction(&GetPageEdit());
         GetPageEdit().GrabFocus();
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(SwNavigationPI, PageEditModifyHdl)
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 8898a1aa8964..d71b4c50fb35 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -192,10 +192,10 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps,
     }
 }
 
-IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
+IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void )
 {
     if(!_xControl.is())
-        return 0;
+        return;
 
     // now get the model
     uno::Reference< beans::XPropertySet >  xPrSet(_xControl, uno::UNO_QUERY);
@@ -397,7 +397,6 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
     }
     else
         pTimer->Start();
-    return 0;
 }
 
 void SwOneExampleFrame::ClearDocument( bool bStartUpdateTimer )