Change all Idle* LINKs to be Timer*

Seem UBSAN doesn't like my forced reinterpret_cast to set the Idles
Link in the Timer class. Now there are two possible solution:

1. convert all (DECL|IMPL).*_LINK call sites to use a Timer* or
2. split the inheritance of Idle from Timer again to maintain
different Link<>s and move all common code into a TimerBase.

While the 1st is more correct, the 2nd has a better indicator for
Idles. This implements the first solution.

And while at it, this also converts all call sites of SetTimeoutHdl
and SetIdleHdl to SetInvokeHandler and gets rid of some local Link
objects, which are just passed to the SetInvokeHandler call.

It also introduces ClearInvokeHandler() and replaces the respective
call sites of SetInvokeHandler( Link<Timer *, void>() ).

Change-Id: I40c4167b1493997b7f136add4dad2f4ff5504b69

28 files changed, 50 insertions, 53 deletions

diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 97d402a471fb..0ca7953f0810 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -52,7 +52,7 @@ namespace sdr
             bool                                    mbRefreshWithPreRendering : 1;
 
             // link for timer
-            DECL_LINK(ImpBufferTimerHandler, Idle*, void);
+            DECL_LINK(ImpBufferTimerHandler, Timer*, void);
 
             // Internal methods for buffering
             void ImpPrepareBufferDevice();
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 86db5f7d29ff..525e81a588ed 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -102,7 +102,7 @@ class SdrItemBrowser: public FloatingWindow {
     SdrView* pView;
     bool bDirty;
     static vcl::Window* ImpGetViewWin(SdrView& rView);
-    DECL_LINK(IdleHdl, Idle *, void);
+    DECL_LINK(IdleHdl, Timer *, void);
     DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void);
     DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void);
 public:
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 704697685176..11d559f958e1 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -287,10 +287,10 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
     Resize();
 
     aUpdateIdle.SetPriority( TaskPriority::LOW );
-    aUpdateIdle.SetIdleHdl( LINK( this, SvxSuperContourDlg, UpdateHdl ) );
+    aUpdateIdle.SetInvokeHandler( LINK( this, SvxSuperContourDlg, UpdateHdl ) );
 
     aCreateIdle.SetPriority( TaskPriority::RESIZE );
-    aCreateIdle.SetIdleHdl( LINK( this, SvxSuperContourDlg, CreateHdl ) );
+    aCreateIdle.SetInvokeHandler( LINK( this, SvxSuperContourDlg, CreateHdl ) );
 }
 
 SvxSuperContourDlg::~SvxSuperContourDlg()
@@ -559,7 +559,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void )
     m_pStbStatus->SetItemText( 3, aStr );
 }
 
-IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Timer *, void)
 {
     aUpdateIdle.Stop();
 
@@ -584,7 +584,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void)
     m_pContourWnd->QueueIdleUpdate();
 }
 
-IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl, Timer *, void)
 {
     aCreateIdle.Stop();
 
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 3b90b0bb7f3f..77d24bbf7a01 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -86,8 +86,8 @@ class SvxSuperContourDlg : public SvxContourDlg
                         DECL_LINK( Tbx1ClickHdl, ToolBox*, void );
                         DECL_LINK( MousePosHdl, GraphCtrl*, void );
                         DECL_LINK( GraphSizeHdl, GraphCtrl*, void );
-                        DECL_LINK( UpdateHdl, Idle *, void );
-                        DECL_LINK( CreateHdl, Idle *, void );
+                        DECL_LINK( UpdateHdl, Timer *, void );
+                        DECL_LINK( CreateHdl, Timer *, void );
                         DECL_LINK( StateHdl, GraphCtrl*, void );
                         DECL_LINK( PipetteHdl, ContourWindow&, void );
                         DECL_LINK( PipetteClickHdl, ContourWindow&, void );
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 86b37f0e925c..16b37123dbdb 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -271,7 +271,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,
     m_pShadowColorLB->SetSelectHdl( LINK(this, SvxFontWorkDialog, ColorSelectHdl_Impl) );
 
     aInputIdle.SetPriority(TaskPriority::LOWEST);
-    aInputIdle.SetIdleHdl(LINK(this, SvxFontWorkDialog, InputTimoutHdl_Impl));
+    aInputIdle.SetInvokeHandler(LINK(this, SvxFontWorkDialog, InputTimoutHdl_Impl));
 }
 
 SvxFontWorkDialog::~SvxFontWorkDialog()
@@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl, Edit&, void)
     aInputIdle.Start();
 }
 
-IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void)
+IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Timer *, void)
 {
     // Possibly set the Metric system again. This should be done with a
     // listen, this is however not possible at the moment due to compatibility
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index afa5364bae61..bed8deff3823 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -71,7 +71,7 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) :
 {
     pUserCall = new GraphCtrlUserCall( *this );
     aUpdateIdle.SetPriority( TaskPriority::LOWEST );
-    aUpdateIdle.SetIdleHdl( LINK( this, GraphCtrl, UpdateHdl ) );
+    aUpdateIdle.SetInvokeHandler( LINK( this, GraphCtrl, UpdateHdl ) );
     aUpdateIdle.Start();
     EnableRTL( false );
 }
@@ -757,7 +757,7 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
     QueueIdleUpdate();
 }
 
-IMPL_LINK( GraphCtrl, UpdateHdl, Idle *, , void )
+IMPL_LINK( GraphCtrl, UpdateHdl, Timer *, , void )
 {
     mbInIdleUpdate = true;
     aUpdateLink.Call( this );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b2084724c53d..dcd1e5242e95 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -205,7 +205,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
     pOwnData->bExecState = false;
 
     pOwnData->aIdle.SetPriority( TaskPriority::LOW );
-    pOwnData->aIdle.SetIdleHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
+    pOwnData->aIdle.SetInvokeHandler( LINK( this, SvxIMapDlg, UpdateHdl ) );
 
     m_pTbxIMapDlg1->EnableItem( mnActiveId, false );
     m_pTbxIMapDlg1->EnableItem( mnMacroId, false );
@@ -720,7 +720,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl, Control&, void)
     pIMapWnd->ReplaceActualIMapInfo( aNewInfo );
 }
 
-IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Timer *, void)
 {
     pOwnData->aIdle.Stop();
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index a7f025d1c11d..c4891b4d69bb 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -421,7 +421,7 @@ void SvxSearchDialog::Construct_Impl()
     // temporary to avoid incompatibility
     pImpl.reset( new SearchDlg_Impl() );
     pImpl->aSelectionTimer.SetTimeout( 500 );
-    pImpl->aSelectionTimer.SetTimeoutHdl(
+    pImpl->aSelectionTimer.SetInvokeHandler(
         LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) );
     EnableControls_Impl( SearchOptionFlags::NONE );
 
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 5295025652ca..18b37372267a 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -467,7 +467,7 @@ void SvxBmpNumValueSet::init()
     SetStyle( GetStyle() | WB_VSCROLL );
     SetLineCount( 3 );
     aFormatIdle.SetPriority(TaskPriority::LOWEST);
-    aFormatIdle.SetIdleHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
+    aFormatIdle.SetInvokeHandler(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
 }
 
 
@@ -513,7 +513,7 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt)
     }
 }
 
-IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void)
+IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl, Timer *, void)
 {
     // only when a graphics was not there, it needs to be formatted
     if (bGrfNotFound)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bde4955b72b8..e467b712710a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1370,7 +1370,7 @@ namespace svxform
         m_pInstanceBtn->SetActivateHdl( aLink2 );
         m_pTabCtrl->SetActivatePageHdl( LINK( this, DataNavigatorWindow, ActivatePageHdl ) );
         m_aUpdateTimer.SetTimeout( 2000 );
-        m_aUpdateTimer.SetTimeoutHdl( LINK( this, DataNavigatorWindow, UpdateHdl ) );
+        m_aUpdateTimer.SetInvokeHandler( LINK( this, DataNavigatorWindow, UpdateHdl ) );
 
         // init tabcontrol
         m_pTabCtrl->Show();
@@ -2749,7 +2749,7 @@ namespace svxform
         m_pEditNamespacesBtn->SetClickHdl( LINK( this, AddConditionDialog, EditHdl ) );
         m_pOKBtn->SetClickHdl( LINK( this, AddConditionDialog, OKHdl ) );
         m_aResultIdle.SetPriority( TaskPriority::LOWEST );
-        m_aResultIdle.SetIdleHdl( LINK( this, AddConditionDialog, ResultHdl ) );
+        m_aResultIdle.SetInvokeHandler( LINK( this, AddConditionDialog, ResultHdl ) );
 
         if ( !m_sPropertyName.isEmpty() )
         {
@@ -2842,7 +2842,7 @@ namespace svxform
     }
 
 
-    IMPL_LINK_NOARG(AddConditionDialog, ResultHdl, Idle *, void)
+    IMPL_LINK_NOARG(AddConditionDialog, ResultHdl, Timer *, void)
     {
         OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' ');
         OUString sResult;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3987b458315e..3c1116a83494 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1094,7 +1094,7 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent )
 
     SetDragDropMode(DragDropMode::ALL);
 
-    m_aDropActionTimer.SetTimeoutHdl(LINK(this, FmFilterNavigator, OnDropActionTimer));
+    m_aDropActionTimer.SetInvokeHandler(LINK(this, FmFilterNavigator, OnDropActionTimer));
 }
 
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 8aebaab5be36..218adc06c597 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -638,7 +638,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         ,m_bFirstActivation( true )
 {
     m_aMarkTimer.SetTimeout(100);
-    m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut));
+    m_aMarkTimer.SetInvokeHandler(LINK(this,FmXFormShell,OnTimeOut));
     m_aMarkTimer.SetDebugName("svx::FmXFormShell m_aMarkTimer");
 
     m_xAttachedFrame = _pViewFrame->GetFrame().GetFrameInterface();
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 4233fc17ab54..3f170ff0c61a 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -537,7 +537,7 @@ namespace svx
         ,m_rBindings( _pFrame->GetBindings() )
         ,m_bNeedClipboardInvalidation( true )
     {
-        m_aClipboardInvalidation.SetTimeoutHdl( LINK( this, FmTextControlShell, OnInvalidateClipboard ) );
+        m_aClipboardInvalidation.SetInvokeHandler( LINK( this, FmTextControlShell, OnInvalidateClipboard ) );
         m_aClipboardInvalidation.SetTimeout( 200 );
     }
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 74ea2897b3bc..3a09dccfa87a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -493,7 +493,7 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any&
 }
 
 
-IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Idle*, void )
+IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Timer*, void )
 {
     activateTabOrder();
 }
@@ -573,10 +573,10 @@ FormController::FormController(const Reference< css::uno::XComponentContext > &
     osl_atomic_decrement(&m_refCount);
 
     m_aTabActivationIdle.SetPriority( TaskPriority::LOWEST );
-    m_aTabActivationIdle.SetIdleHdl( LINK( this, FormController, OnActivateTabOrder ) );
+    m_aTabActivationIdle.SetInvokeHandler( LINK( this, FormController, OnActivateTabOrder ) );
 
     m_aFeatureInvalidationTimer.SetTimeout( 200 );
-    m_aFeatureInvalidationTimer.SetTimeoutHdl( LINK( this, FormController, OnInvalidateFeatures ) );
+    m_aFeatureInvalidationTimer.SetInvokeHandler( LINK( this, FormController, OnInvalidateFeatures ) );
 }
 
 
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index fb460d509778..0941b8b52b0f 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -148,9 +148,9 @@ namespace svxform
 
         StartListening( *m_pNavModel );
 
-        m_aDropActionTimer.SetTimeoutHdl(LINK(this, NavigatorTree, OnDropActionTimer));
+        m_aDropActionTimer.SetInvokeHandler(LINK(this, NavigatorTree, OnDropActionTimer));
 
-        m_aSynchronizeTimer.SetTimeoutHdl(LINK(this, NavigatorTree, OnSynchronizeTimer));
+        m_aSynchronizeTimer.SetInvokeHandler(LINK(this, NavigatorTree, OnSynchronizeTimer));
         SetSelectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
         SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
     }
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index c573ff164d65..b8de220fe7c1 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -469,7 +469,7 @@ namespace svxform
         XPropertySet_ref        m_xBinding;
 
         DECL_LINK(ModifyHdl, Edit&, void);
-        DECL_LINK(ResultHdl, Idle *, void);
+        DECL_LINK(ResultHdl, Timer *, void);
         DECL_LINK(EditHdl, Button*, void);
         DECL_LINK(OKHdl, Button*, void);
 
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 9099c0412e47..f9537a93c245 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -564,7 +564,7 @@ namespace svxform
         bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
         css::uno::Reference< css::awt::XControl> isInList(const css::uno::Reference< css::awt::XWindowPeer>& xPeer) const;
 
-        DECL_LINK( OnActivateTabOrder, Idle*, void );
+        DECL_LINK( OnActivateTabOrder, Timer*, void );
         DECL_LINK( OnInvalidateFeatures, Timer*, void );
         DECL_LINK( OnLoad, void*, void );
         DECL_LINK( OnToggleAutoFields, void*, void );
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 73a1051d66a1..ddb9b0a28026 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -205,7 +205,7 @@ namespace sdr
             mpBufferDevice->EnableMapMode(bMapModeWasEnabledSource);
         }
 
-        IMPL_LINK_NOARG(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void)
+        IMPL_LINK_NOARG(OverlayManagerBuffered, ImpBufferTimerHandler, Timer*, void)
         {
             //Resolves: fdo#46728 ensure this exists until end of scope
             rtl::Reference<OverlayManager> xRef(this);
@@ -384,7 +384,7 @@ namespace sdr
         {
             // Init timer
             maBufferIdle.SetPriority( TaskPriority::POST_PAINT );
-            maBufferIdle.SetIdleHdl(LINK(this, OverlayManagerBuffered, ImpBufferTimerHandler));
+            maBufferIdle.SetInvokeHandler(LINK(this, OverlayManagerBuffered, ImpBufferTimerHandler));
             maBufferIdle.SetDebugName( "sdr::overlay::OverlayManagerBuffered maBufferIdle" );
         }
 
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index eaa66be0d86f..80245dcd9bf2 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -26,7 +26,7 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin
     SetStyle(GetStyle() | WB_DIALOGCONTROL);
     m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame));
     m_aPanelLayoutIdle.SetPriority(TaskPriority::RESIZE);
-    m_aPanelLayoutIdle.SetIdleHdl( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) );
+    m_aPanelLayoutIdle.SetInvokeHandler( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) );
     m_aPanelLayoutIdle.SetDebugName( "svx::PanelLayout  m_aPanelLayoutIdle" );
     if (GetSettings().GetStyleSettings().GetAutoMnemonic())
        Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
@@ -70,7 +70,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/)
     m_aPanelLayoutIdle.Start();
 }
 
-IMPL_LINK_NOARG( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void )
+IMPL_LINK_NOARG( PanelLayout, ImplHandlePanelLayoutTimerHdl, Timer*, void )
 {
     vcl::Window *pChild = GetWindow(GetWindowType::FirstChild);
     assert(pChild);
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 0b4773c439bd..fe7c0f9600f7 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -82,7 +82,7 @@ void MediaPlaybackPanel::Initialize()
     mpTimeSlider->SetSlideHdl(LINK(this, MediaPlaybackPanel, SeekHdl));
 
     maIdle.SetPriority( TaskPriority::HIGHEST );
-    maIdle.SetIdleHdl( LINK( this, MediaPlaybackPanel, TimeoutHdl ) );
+    maIdle.SetInvokeHandler( LINK( this, MediaPlaybackPanel, TimeoutHdl ) );
     maIdle.Start();
     mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX);
 }
@@ -140,7 +140,7 @@ IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, Slider*, void)
     mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX);
 }
 
-IMPL_LINK_NOARG( MediaPlaybackPanel, TimeoutHdl, Idle*, void)
+IMPL_LINK_NOARG( MediaPlaybackPanel, TimeoutHdl, Timer*, void)
 {
     mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX);
 }
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
index d7c88456a605..b4633d7a5549 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
@@ -73,7 +73,7 @@ private:
     DECL_LINK(PlayToolBoxSelectHdl, ToolBox*, void);
     DECL_LINK(VolumeSlideHdl, Slider*, void);
     DECL_LINK(SeekHdl, Slider*, void);
-    DECL_LINK(TimeoutHdl, Idle*, void);
+    DECL_LINK(TimeoutHdl, Timer*, void);
 };
 
 
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index ccdf094082db..2476d1481ad9 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -66,7 +66,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     mxImpl(new ImplData)
 {
-    mxImpl->maIdle.SetIdleHdl( LINK(this, SvxModifyControl, OnTimer) );
+    mxImpl->maIdle.SetInvokeHandler( LINK(this, SvxModifyControl, OnTimer) );
 }
 
 
@@ -95,7 +95,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
 }
 
 
-IMPL_LINK( SvxModifyControl, OnTimer, Idle *, pTimer, void )
+IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer, void )
 {
     if (pTimer == nullptr)
         return;
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index db57960d8363..74cb4343adcb 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -111,13 +111,10 @@ OLEObjCache::OLEObjCache()
     else
         nSize = 100;
     pTimer = new AutoTimer( "svx OLEObjCache pTimer UnloadCheck" );
-    Link<Timer *, void> aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
-
-    pTimer->SetTimeoutHdl(aLink);
+    pTimer->SetInvokeHandler( LINK(this, OLEObjCache, UnloadCheckHdl) );
     pTimer->SetTimeout(20000);
+    pTimer->Invoke();
     pTimer->Start();
-
-    aLink.Call(pTimer);
 }
 
 OLEObjCache::~OLEObjCache()
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cb444c30bfca..915ae2e7ff2e 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1047,7 +1047,7 @@ SdrItemBrowser::SdrItemBrowser(SdrView& rView):
     SetOutputSizePixel(aBrowse->GetSizePixel());
     SetText("Joe's ItemBrowser");
     aBrowse->Show();
-    aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl));
+    aIdle.SetInvokeHandler(LINK(this,SdrItemBrowser,IdleHdl));
     GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
     GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl));
     SetDirty();
@@ -1127,7 +1127,7 @@ void SdrItemBrowser::Undirty()
     }
 }
 
-IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl, Idle *, void)
+IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl, Timer *, void)
 {
     Undirty();
 }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 9e8a41a1032c..bd019285fc13 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -174,7 +174,7 @@ void SdrPaintView::ImpClearVars()
     mbSomeObjChgdFlag=false;
     mnGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD;
     maComeBackIdle.SetPriority(TaskPriority::REPAINT);
-    maComeBackIdle.SetIdleHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
+    maComeBackIdle.SetInvokeHandler(LINK(this,SdrPaintView,ImpComeBackHdl));
     maComeBackIdle.SetDebugName( "svx::SdrPaintView aComeBackIdle" );
 
     if (mpModel)
@@ -271,7 +271,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , Conf
     InvalidateAllWin();
 }
 
-IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl, Idle *, void)
+IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl, Timer *, void)
 {
     if (mbSomeObjChgdFlag) {
         mbSomeObjChgdFlag=false;
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 7f64405eb058..c8ee4f32ff32 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -42,7 +42,7 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot
 {
     sal_uInt64 nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
 
-    m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) );
+    m_aDoubleClickTimer.SetInvokeHandler( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) );
     m_aDoubleClickTimer.SetTimeout(nDblClkTime);
 }
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 2ce539616209..1f6da2730181 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -74,7 +74,7 @@ private:
     OUString            maCommand;
     Reference< XFrame > mxFrame;
 
-                    DECL_LINK(ImplModifyHdl, Idle *, void);
+                    DECL_LINK(ImplModifyHdl, Timer *, void);
 
 protected:
 
@@ -122,7 +122,7 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString&
     }
 
     maIdle.SetPriority( TaskPriority::LOW );
-    maIdle.SetIdleHdl( LINK( this, ImplGrafMetricField, ImplModifyHdl ) );
+    maIdle.SetInvokeHandler( LINK( this, ImplGrafMetricField, ImplModifyHdl ) );
 }
 
 void ImplGrafMetricField::Modify()
@@ -130,7 +130,7 @@ void ImplGrafMetricField::Modify()
     maIdle.Start();
 }
 
-IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl, Idle *, void)
+IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl, Timer *, void)
 {
     const sal_Int64 nVal = GetValue();
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 72c416944af2..6faa9fdeba40 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -64,7 +64,7 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame
     Show();
 
     aDelayTimer.SetTimeout( DELAY_TIMEOUT );
-    aDelayTimer.SetTimeoutHdl( LINK( this, SvxLineBox, DelayHdl_Impl ) );
+    aDelayTimer.SetInvokeHandler( LINK( this, SvxLineBox, DelayHdl_Impl ) );
     aDelayTimer.Start();
 }