Use typed Idle::SetIdleHdl Link

Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9

12 files changed, 31 insertions, 39 deletions

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 21d0bb5414fd..1a3e359b3f4c 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -191,7 +191,7 @@ private:
     SAL_DLLPRIVATE void                SpellObject(SdrTextObj* pObj);
 
                         DECL_DLLPRIVATE_LINK_TYPED(WorkStartupHdl, Timer *, void);
-                        DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, void *);
+                        DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellingHdl, Idle *, void);
                         DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus*);
 
     std::vector< OUString > maAnnotationAuthors;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 1abbd8e136ad..fcc4d88211ab 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -823,7 +823,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
 }
 
 // OnlineSpelling in the background
-IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
+IMPL_LINK_NOARG_TYPED(SdDrawDocument, OnlineSpellingHdl, Idle *, void)
 {
     if (mpOnlineSpellingList!=NULL
         && ( !mbOnlineSpell || mpOnlineSpellingList->hasMore()))
@@ -872,8 +872,6 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
         delete mpOnlineSearchItem;
         mpOnlineSearchItem = NULL;
     }
-
-    return 0;
 }
 
 // Spell object (for OnlineSpelling)
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index eff19c5f365f..d02f13128b80 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -166,11 +166,10 @@ short BreakDlg::Execute()
 /**
  * link-method which starts the working function
  */
-IMPL_LINK_NOARG(BreakDlg, InitialUpdate)
+IMPL_LINK_NOARG_TYPED(BreakDlg, InitialUpdate, Idle *, void)
 {
     pDrView->DoImportMarkedMtf(pProgrInfo);
     EndDialog(RET_OK);
-    return 0L;
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 4ff7fa99d96d..0450ef24d044 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -227,14 +227,15 @@ public:
 
     DECL_LINK( SelectFileHdl, void * );
     DECL_LINK( SelectRegionHdl, ListBox * );
-    DECL_LINK( UpdatePreviewHdl, void * );
-    DECL_LINK( UpdatePageListHdl, void * );
+    DECL_LINK_TYPED( UpdatePreviewHdl, Idle *, void );
+    DECL_LINK_TYPED( UpdatePageListHdl, Idle *, void );
     DECL_LINK( StartTypeHdl, RadioButton * );
     DECL_LINK( SelectTemplateHdl, void * );
     DECL_LINK( NextPageHdl, void * );
     DECL_LINK( LastPageHdl, void * );
     DECL_LINK( PreviewFlagHdl, void * );
-    DECL_LINK( EffectPreviewHdl, void * );
+    DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void );
+    DECL_LINK( EffectPreviewClickHdl, void * );
     DECL_LINK( SelectLayoutHdl, void * );
     DECL_LINK( PageSelectHdl, void * );
     DECL_LINK( PresTypeHdl, void * );
@@ -579,7 +580,7 @@ AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link<>& rFinishL
 
     mpPreviewFlag->Check( mbPreview );
     mpPreviewFlag->SetClickHdl(LINK(this, AssistentDlgImpl, PreviewFlagHdl ));
-    mpPreview->SetClickHdl(LINK(this,AssistentDlgImpl, EffectPreviewHdl ));
+    mpPreview->SetClickHdl(LINK(this,AssistentDlgImpl, EffectPreviewClickHdl ));
 
     // sets the exit page
     maAssistentFunc.GotoPage(1);
@@ -589,7 +590,7 @@ AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link<>& rFinishL
     maPrevIdle.SetIdleHdl( LINK( this, AssistentDlgImpl, UpdatePreviewHdl));
 
     maEffectPrevIdle.SetPriority( SchedulerPriority::MEDIUM );
-    maEffectPrevIdle.SetIdleHdl( LINK( this, AssistentDlgImpl, EffectPreviewHdl ));
+    maEffectPrevIdle.SetIdleHdl( LINK( this, AssistentDlgImpl, EffectPreviewIdleHdl ));
 
     maUpdatePageListIdle.SetPriority( SchedulerPriority::MEDIUM );
     maUpdatePageListIdle.SetIdleHdl( LINK( this, AssistentDlgImpl, UpdatePageListHdl));
@@ -1107,7 +1108,7 @@ IMPL_LINK( AssistentDlgImpl, OpenButtonHdl, Button*, pButton )
     return mpPage1OpenLB->GetDoubleClickHdl().Call(pButton);
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, EffectPreviewIdleHdl, Idle *, void)
 {
     if(mbPreview && xDocShell.Is() )
     {
@@ -1125,6 +1126,11 @@ IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewHdl)
         }
         mpPreview->startPreview();
     }
+}
+
+IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewClickHdl)
+{
+    EffectPreviewIdleHdl(nullptr);
     return 0;
 }
 
@@ -1173,16 +1179,14 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePageListHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePageListHdl, Idle *, void)
 {
     UpdatePageList();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePreviewHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePreviewHdl, Idle *, void)
 {
     UpdatePreview( true );
-    return 0;
 }
 
 IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton )
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ae7c5da3b28d..27d69ec7d524 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -62,7 +62,7 @@ private:
 
     Idle                        maUpdateIdle;
 
-                                DECL_LINK( IsMusicStoppedHdl, void * );
+                                DECL_LINK_TYPED( IsMusicStoppedHdl, Idle *, void );
 
 public:
                                 SdFileDialog_Imp( const short nDialogType, bool bUsableSelection );
@@ -163,7 +163,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
+IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
 {
     SolarMutexGuard aGuard;
 
@@ -173,7 +173,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
        )
     {
         maUpdateIdle.Start();
-        return 0L;
+        return;
     }
 
     if( mxControlAccess.is() )
@@ -191,8 +191,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
 #endif
         }
     }
-
-    return 0L;
 }
 
 // check whether to disable the "selection" checkbox
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 3e9ef23a51b1..bfcbdf5e7f24 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,7 +118,7 @@ void SAL_CALL ShellStackGuard::disposing (
         }
 }
 
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
+IMPL_LINK_TYPED(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void)
 {
 #ifdef DEBUG
     OSL_ASSERT(pIdle==&maPrinterPollingIdle);
@@ -138,8 +138,6 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
             maPrinterPollingIdle.Start();
         }
     }
-
-    return 0;
 }
 
 bool ShellStackGuard::IsPrinting() const
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 851687490d1b..c9033eadb568 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -87,7 +87,7 @@ private:
     ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
     Idle maPrinterPollingIdle;
 
-    DECL_LINK(TimeoutHandler, Idle*);
+    DECL_LINK_TYPED(TimeoutHandler, Idle*, void);
 
     /** Return <TRUE/> when the printer is printing.  Return <FALSE/> when
         the printer is not printing, or there is no printer, or something
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 6be181af2cad..2a807a7870d3 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -74,7 +74,7 @@ private:
 
     DECL_LINK( CancelButtonHdl, void* );
     DECL_LINK( UpDate, void* );
-    DECL_LINK( InitialUpdate, void* );
+    DECL_LINK_TYPED( InitialUpdate, Idle*, void );
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 79207b406159..610648d78014 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -284,8 +284,8 @@ protected:
     boost::ptr_vector<SdViewRedrawRec> maLockedRedraws;
     bool                    mbIsDropAllowed;
 
-                            DECL_LINK( DropErrorHdl, void* );
-                            DECL_LINK( DropInsertFileHdl, void* );
+                            DECL_LINK_TYPED( DropErrorHdl, Idle*, void );
+                            DECL_LINK_TYPED( DropInsertFileHdl, Idle*, void );
                             DECL_LINK( ExecuteNavigatorDrop, SdNavigatorDropEvent* pSdNavigatorDropEvent );
 
     void ImplClearDrawDropMarker();
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index e2f909075953..0d43120c134f 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -219,10 +219,10 @@ void Animator::RequestNextFrame (const double nFrameStart)
     }
 }
 
-IMPL_LINK_NOARG(Animator, TimeoutHandler)
+IMPL_LINK_NOARG_TYPED(Animator, TimeoutHandler, Idle *, void)
 {
     if (mbIsDisposed)
-        return 0;
+        return;
 
     if (ProcessAnimations(maElapsedTime.getElapsedTime()))
         CleanUpAnimationList();
@@ -232,8 +232,6 @@ IMPL_LINK_NOARG(Animator, TimeoutHandler)
 
     if (!maAnimations.empty())
         RequestNextFrame();
-
-    return 0;
 }
 
 //===== Animator::Animation ===================================================
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index faf620cd9a0e..d58511fec397 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -105,7 +105,7 @@ private:
 
     AnimationId mnNextAnimationId;
 
-    DECL_LINK(TimeoutHandler, void *);
+    DECL_LINK_TYPED(TimeoutHandler, Idle *, void);
 
     /** Execute one step of every active animation.
         @param nTime
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 929beb64ea6e..0395499284c1 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -398,11 +398,11 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
 /**
  * Timer handler for InsertFile at Drop()
  */
-IMPL_LINK_NOARG(View, DropInsertFileHdl)
+IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void)
 {
     DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" );
     if( !mpViewSh )
-        return 0;
+        return;
 
     SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), RID_SO_ERRCTX );
     ErrCode nError = 0;
@@ -584,17 +584,14 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
 
     if( nError )
         ErrorHandler::HandleError( nError );
-
-    return nError;
 }
 
 /**
  * Timer handler for Errorhandling at Drop()
  */
-IMPL_LINK_NOARG(View, DropErrorHdl)
+IMPL_LINK_NOARG_TYPED(View, DropErrorHdl, Idle *, void)
 {
     InfoBox( mpViewSh ? mpViewSh->GetActiveWindow() : 0, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute();
-    return 0;
 }
 
 /**