/xmloff/inc/forms/

'>
LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2017-01-23 19:37:51 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2017-01-23 20:49:05 +0100
commitbf110d40efcc79efb9247fdce5d2f54bafa6550b (patch)
tree4e9fad96d91adfd5159b009b430a64d4a6863bd6
parent75d8b305bbc1c2377f23361ecd64816a350baa4c (diff)
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
Diffstat
-rw-r--r--avmedia/inc/mediacontrol.hxx2
-rw-r--r--avmedia/source/framework/mediacontrol.cxx4
-rw-r--r--avmedia/source/framework/soundhandler.cxx4
-rw-r--r--avmedia/source/framework/soundhandler.hxx2
-rw-r--r--avmedia/source/opengl/oglplayer.cxx2
-rw-r--r--basctl/source/basicide/baside2.hxx2
-rw-r--r--basctl/source/basicide/baside2b.cxx4
-rw-r--r--basctl/source/dlged/dlged.cxx4
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx2
-rw-r--r--basctl/source/inc/dlged.hxx2
-rw-r--r--chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx2
-rw-r--r--chart2/source/view/charttypes/GL3DBarChart.cxx4
-rw-r--r--chart2/source/view/inc/GL3DBarChart.hxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx2
-rw-r--r--cui/source/customize/selector.cxx2
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx2
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx6
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/hldoctp.cxx2
-rw-r--r--cui/source/dialogs/hlinettp.cxx2
-rw-r--r--cui/source/dialogs/linkdlg.cxx4
-rw-r--r--cui/source/dialogs/thesdlg.cxx4
-rw-r--r--cui/source/inc/backgrnd.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx2
-rw-r--r--cui/source/inc/linkdlg.hxx2
-rw-r--r--cui/source/inc/macroass.hxx2
-rw-r--r--cui/source/inc/thesdlg.hxx2
-rw-r--r--cui/source/options/optjava.cxx4
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/tabpages/backgrnd.cxx6
-rw-r--r--cui/source/tabpages/chardlg.cxx4
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx2
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx2
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx4
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx2
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--desktop/source/app/app.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx4
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/editeng/impedit2.cxx6
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx4
-rw-r--r--extensions/source/bibliography/bibcont.hxx2
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx8
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/ListBox.cxx4
-rw-r--r--forms/source/component/ListBox.hxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx10
-rw-r--r--formula/source/ui/dlg/funcutl.cxx10
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
-rw-r--r--include/formula/formula.hxx2
-rw-r--r--include/formula/funcutl.hxx2
-rw-r--r--include/sfx2/basedlgs.hxx4
-rw-r--r--include/sfx2/dinfdlg.hxx4
-rw-r--r--include/sfx2/dispatch.hxx2
-rw-r--r--include/sfx2/dockwin.hxx2
-rw-r--r--include/svtools/asynclink.hxx3
-rw-r--r--include/svtools/filechangedchecker.hxx2
-rw-r--r--include/svtools/treelistbox.hxx2
-rw-r--r--include/svtools/wizdlg.hxx2
-rw-r--r--include/svx/fontwork.hxx2
-rw-r--r--include/svx/graphctl.hxx2
-rw-r--r--include/svx/imapdlg.hxx2
-rw-r--r--include/svx/modctrl.hxx2
-rw-r--r--include/svx/numvset.hxx2
-rw-r--r--include/svx/sidebar/PanelLayout.hxx2
-rw-r--r--include/svx/svdpntv.hxx2
-rw-r--r--include/vcl/dockwin.hxx2
-rw-r--r--include/vcl/idle.hxx13
-rw-r--r--include/vcl/syswin.hxx2
-rw-r--r--include/vcl/texteng.hxx2
-rw-r--r--include/vcl/timer.hxx13
-rw-r--r--include/vcl/toolbox.hxx2
-rw-r--r--include/vcl/window.hxx4
-rw-r--r--linguistic/source/lngsvcmgr.cxx4
-rw-r--r--linguistic/source/lngsvcmgr.hxx2
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx2
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx4
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
-rw-r--r--sc/inc/chartlis.hxx2
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/scmod.hxx2
-rw-r--r--sc/source/core/data/documen2.cxx4
-rw-r--r--sc/source/core/tool/chartlis.cxx4
-rw-r--r--sc/source/core/tool/chartlock.cxx2
-rw-r--r--sc/source/core/tool/refreshtimer.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx6
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx2
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx4
-rw-r--r--sc/source/ui/docshell/autostyl.cxx6
-rw-r--r--sc/source/ui/docshell/datastream.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx2
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx4
-rw-r--r--sc/source/ui/inc/acredlin.hxx4
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx2
-rw-r--r--sc/source/ui/inc/autostyl.hxx2
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx2
-rw-r--r--sc/source/ui/inc/filtdlg.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx2
-rw-r--r--sc/source/ui/inc/tphfedit.hxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx8
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx2
-rw-r--r--sc/source/ui/navipi/navipi.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx8
-rw-r--r--sc/source/ui/view/notemark.cxx2
-rw-r--r--sc/source/ui/view/tabview5.cxx2
-rw-r--r--sc/workben/result.cxx2
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx2
-rw-r--r--sd/source/core/drawdoc2.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx4
-rw-r--r--sd/source/ui/dlg/filedlg.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx2
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.cxx4
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.hxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx6
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx4
-rw-r--r--sd/source/ui/slideshow/showwin.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx2
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx3
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx3
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/sdview4.cxx4
-rw-r--r--sfx2/source/appl/appcfg.cxx6
-rw-r--r--sfx2/source/appl/newhelp.cxx19
-rw-r--r--sfx2/source/appl/newhelp.hxx8
-rw-r--r--sfx2/source/control/bindings.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx8
-rw-r--r--sfx2/source/control/itemdel.cxx6
-rw-r--r--sfx2/source/dialog/basedlgs.cxx10
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx8
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx10
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/splitwin.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
-rw-r--r--sfx2/source/doc/new.cxx6
-rw-r--r--sfx2/source/inc/templdgi.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--slideshow/test/demoshow.cxx2
-rw-r--r--starmath/inc/edit.hxx4
-rw-r--r--starmath/source/edit.cxx8
-rw-r--r--starmath/source/view.cxx4
-rw-r--r--svtools/source/brwbox/datwin.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/contnr/imivctl.hxx10
-rw-r--r--svtools/source/contnr/imivctl1.cxx26
-rw-r--r--svtools/source/contnr/svimpbox.cxx8
-rw-r--r--svtools/source/contnr/treelistbox.cxx4
-rw-r--r--svtools/source/control/asynclink.cxx2
-rw-r--r--svtools/source/control/calendar.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx6
-rw-r--r--svtools/source/control/valueset.cxx2
-rw-r--r--svtools/source/dialogs/prnsetup.cxx2
-rw-r--r--svtools/source/dialogs/wizdlg.cxx4
-rw-r--r--svtools/source/graphic/grfcache.cxx2
-rw-r--r--svtools/source/graphic/grfmgr.cxx2
-rw-r--r--svtools/source/inc/svimpbox.hxx4
-rw-r--r--svtools/source/misc/filechangedchecker.cxx4
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx2
-rw-r--r--svx/inc/svdibrow.hxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx8
-rw-r--r--svx/source/dialog/contimp.hxx4
-rw-r--r--svx/source/dialog/fontwork.cxx4
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx4
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx4
-rw-r--r--svx/source/inc/datanavi.hxx2
-rw-r--r--svx/source/inc/formcontroller.hxx2
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx4
-rw-r--r--svx/source/sidebar/PanelLayout.cxx4
-rw-r--r--svx/source/sidebar/media/MediaPlaybackPanel.cxx4
-rw-r--r--svx/source/sidebar/media/MediaPlaybackPanel.hxx2
-rw-r--r--svx/source/stbctrls/modctrl.cxx4
-rw-r--r--svx/source/svdraw/svdetc.cxx7
-rw-r--r--svx/source/svdraw/svdibrow.cxx4
-rw-r--r--svx/source/svdraw/svdpntv.cxx4
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx2
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx6
-rw-r--r--sw/source/core/doc/DocumentStatisticsManager.cxx5
-rw-r--r--sw/source/core/doc/DocumentTimerManager.cxx4
-rw-r--r--sw/source/core/doc/docdesc.cxx2
-rw-r--r--sw/source/core/doc/docnew.cxx2
-rw-r--r--sw/source/core/doc/htmltbl.cxx2
-rw-r--r--sw/source/core/docnode/threadmanager.cxx4
-rw-r--r--sw/source/core/inc/DocumentTimerManager.hxx2
-rw-r--r--sw/source/core/inc/threadmanager.hxx2
-rw-r--r--sw/source/core/text/blink.cxx2
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx4
-rw-r--r--sw/source/ui/envelp/labfmt.cxx4
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/inc/mmresultdialogs.hxx2
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx6
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx10
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx4
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx2
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/inc/navipi.hxx2
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx2
-rw-r--r--sw/source/uibase/inc/unotools.hxx2
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx4
-rw-r--r--sw/source/uibase/misc/swruler.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx2
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx2
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx4
-rw-r--r--sw/source/uibase/utlui/unotools.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx2
-rw-r--r--vcl/backendtest/VisualBackendTest.cxx2
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx2
-rw-r--r--vcl/source/app/help.cxx4
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/control/menubtn.cxx2
-rw-r--r--vcl/source/control/quickselectionengine.cxx2
-rw-r--r--vcl/source/control/scrbar.cxx4
-rw-r--r--vcl/source/control/spinbtn.cxx2
-rw-r--r--vcl/source/control/spinfld.cxx2
-rw-r--r--vcl/source/control/throbber.cxx2
-rw-r--r--vcl/source/edit/texteng.cxx4
-rw-r--r--vcl/source/edit/vclmedit.cxx2
-rw-r--r--vcl/source/gdi/animate.cxx4
-rw-r--r--vcl/source/window/cursor.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx12
-rw-r--r--vcl/source/window/dockwin.cxx10
-rw-r--r--vcl/source/window/menufloatingwindow.cxx6
-rw-r--r--vcl/source/window/paint.cxx4
-rw-r--r--vcl/source/window/scrwnd.cxx2
-rw-r--r--vcl/source/window/seleng.cxx2
-rw-r--r--vcl/source/window/syswin.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx6
-rw-r--r--vcl/source/window/window.cxx4
-rw-r--r--vcl/source/window/window2.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx6
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx4
-rw-r--r--vcl/workben/vcldemo.cxx2
290 files changed, 491 insertions, 523 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 9feb1c15a486..a6c247b7c687 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -69,7 +69,7 @@ private:
DECL_LINK( implVolumeHdl, Slider*, void );
DECL_LINK( implSelectHdl, ToolBox*, void );
DECL_LINK( implZoomSelectHdl, ListBox&, void );
- DECL_LINK(implTimeoutHdl, Idle *, void);
+ DECL_LINK(implTimeoutHdl, Timer *, void);
Idle maIdle;
MediaItem maItem;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 0f257eff36ad..18d4f5599618 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -115,7 +115,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
}
maIdle.SetPriority( TaskPriority::LOW );
- maIdle.SetIdleHdl( LINK( this, MediaControl, implTimeoutHdl ) );
+ maIdle.SetInvokeHandler( LINK( this, MediaControl, implTimeoutHdl ) );
maIdle.Start();
}
@@ -343,7 +343,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
-IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Idle *, void)
+IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Timer *, void)
{
update();
}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 0907555bfe84..65a10ba3d3bb 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -146,7 +146,7 @@ SoundHandler::SoundHandler()
, m_bError ( false )
, m_aUpdateIdle ( "avmedia SoundHandler Update" )
{
- m_aUpdateIdle.SetIdleHdl(LINK(this, SoundHandler, implts_PlayerNotify));
+ m_aUpdateIdle.SetInvokeHandler(LINK(this, SoundHandler, implts_PlayerNotify));
}
/*-************************************************************************************************************
@@ -298,7 +298,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
@return 0 every time... it doesn't matter for us.
@threadsafe yes
*//*-*************************************************************************************************************/
-IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Idle *, void)
+IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void)
{
// SAFE {
::osl::ClearableMutexGuard aLock( m_aLock );
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index de718d5b9897..f055fdf82931 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -110,7 +110,7 @@ class SoundHandler : // interfaces
// private methods
private:
- DECL_LINK( implts_PlayerNotify, Idle*, void );
+ DECL_LINK( implts_PlayerNotify, Timer*, void );
// variables
// (should be private everyway!)
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 12b746a384dd..4c5eba196713 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -124,7 +124,7 @@ bool OGLPlayer::create( const OUString& rURL )
// Set timer
m_aTimer.SetTimeout(8); // is 125fps enough for anyone ?
m_aTimer.SetPriority(TaskPriority::LOW);
- m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler));
+ m_aTimer.SetInvokeHandler(LINK(this,OGLPlayer,TimerHandler));
return true;
}
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index d1799d116fae..eac82321f975 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -88,7 +88,7 @@ private:
SyntaxHighlighter aHighlighter;
Idle aSyntaxIdle;
std::set<sal_uInt16> aSyntaxLineTable;
- DECL_LINK(SyntaxTimerHdl, Idle *, void);
+ DECL_LINK(SyntaxTimerHdl, Timer *, void);
// progress bar
class ProgressInfo;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index a7d88ef8c3fd..bd0b4cff2249 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -961,7 +961,7 @@ void EditorWindow::CreateEditEngine()
ImplSetFont();
aSyntaxIdle.SetPriority( TaskPriority::LOWER );
- aSyntaxIdle.SetIdleHdl( LINK( this, EditorWindow, SyntaxTimerHdl ) );
+ aSyntaxIdle.SetInvokeHandler( LINK( this, EditorWindow, SyntaxTimerHdl ) );
bool bWasDoSyntaxHighlight = bDoSyntaxHighlight;
bDoSyntaxHighlight = false; // too slow for large texts...
@@ -1253,7 +1253,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
}
}
-IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Timer *, void)
{
DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index cc0aa7fcb755..052506d61ef4 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -218,7 +218,7 @@ DlgEditor::DlgEditor (
m_ClipboardDataFlavorsResource[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
aMarkIdle.SetPriority(TaskPriority::LOW);
- aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) );
+ aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) );
rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );
pDlgEdPage->SetSize( rWindow.PixelToLogic( Size(DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN) ) );
@@ -574,7 +574,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
}
-IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Idle *, void)
+IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Timer *, void)
{
rLayout.UpdatePropertyBrowser();
}
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 2ace04cf7350..52b5434bb020 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -80,7 +80,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
rParent(rParent_)
{
- aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
+ aScrollTimer.SetInvokeHandler( LINK( this, DlgEdFunc, ScrollTimeout ) );
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
}
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index d4af255a843c..5e2e73bb781d 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -102,7 +102,7 @@ public:
};
private:
- DECL_LINK(MarkTimeout, Idle *, void);
+ DECL_LINK(MarkTimeout, Timer *, void);
static void Print( Printer* pPrinter, const OUString& rTitle );
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index 66293238f55f..c72efb343b6a 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -32,7 +32,7 @@ TimerTriggeredControllerLock::TimerTriggeredControllerLock( const uno::Reference
, m_aTimer()
{
m_aTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
- m_aTimer.SetTimeoutHdl( LINK( this, TimerTriggeredControllerLock, TimerTimeout ) );
+ m_aTimer.SetInvokeHandler( LINK( this, TimerTriggeredControllerLock, TimerTimeout ) );
}
TimerTriggeredControllerLock::~TimerTriggeredControllerLock()
{
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8c331a2fe484..2067180cb258 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -122,7 +122,7 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
[this]() { return this->GetContextName(); },
this, vcl::EnumContext::Context::Cell))
{
- m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) );
+ m_aDoubleClickTimer.SetInvokeHandler( LINK( this, ChartController, DoubleClickWaitingHdl ) );
}
ChartController::~ChartController()
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index fea7cf0dcd0e..e0c9567e686d 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -559,7 +559,7 @@ GL3DBarChart::GL3DBarChart(
mbAutoFly = atoi(aAutoFly);
}
maIdle.SetPriority(TaskPriority::REPAINT);
- maIdle.SetIdleHdl(LINK(this, GL3DBarChart, UpdateTimerHdl));
+ maIdle.SetInvokeHandler(LINK(this, GL3DBarChart, UpdateTimerHdl));
maIdle.SetDebugName( "charttypes::GL3DBarChart maIdle" );
maIdle.Start();
osl_getSystemTime(&maFPSRenderStartTime);
@@ -1471,7 +1471,7 @@ void GL3DBarChart::processAutoFly(sal_uInt32 nId, sal_uInt32 nColor)
}
}
-IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl, Timer *, void)
{
updateScreenText();
maIdle.Start();
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index f69b2f8567eb..fc91f44ee856 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -100,7 +100,7 @@ private:
void updateScreenText();
void updateRenderFPS();
void updateDataUpdateFPS();
- DECL_LINK(UpdateTimerHdl, Idle*, void);
+ DECL_LINK(UpdateTimerHdl, Timer*, void);
static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime);
float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag,
const glm::vec4& rColor,
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 45c819b0d46e..23023bdf26c4 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3289,7 +3289,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize )
if(maTimeBased.bTimeBased && maTimeBased.eMode != MANUAL && !maTimeBased.maTimer.IsActive())
{
maTimeBased.maTimer.SetTimeout(15);
- maTimeBased.maTimer.SetTimeoutHdl(LINK(this, ChartView, UpdateTimeBased));
+ maTimeBased.maTimer.SetInvokeHandler(LINK(this, ChartView, UpdateTimeBased));
maTimeBased.maTimer.Start();
}
}
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 814ba4bfe908..874384694521 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -84,7 +84,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits
// Timer for the BallonHelp
aTimer.SetTimeout( 200 );
- aTimer.SetTimeoutHdl(
+ aTimer.SetInvokeHandler(
LINK( this, SvxConfigFunctionListBox, TimerHdl ) );
}
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index e21e81e6c66a..0e1675105acd 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -269,7 +269,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText);
// initial
- m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint));
+ m_aDelayedPaint.SetInvokeHandler(LINK(this, FmSearchDialog, OnDelayedPaint));
m_aDelayedPaint.SetTimeout(500);
EnableSearchUI(true);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 185ffc6be5c3..a8ec9ef2ed2a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -449,7 +449,7 @@ short ActualizeProgress::Execute()
short nRet;
pIdle = new Idle("ActualizeProgressTimeout");
- pIdle->SetIdleHdl( LINK( this, ActualizeProgress, TimeoutHdl ) );
+ pIdle->SetInvokeHandler( LINK( this, ActualizeProgress, TimeoutHdl ) );
pIdle->SetPriority( TaskPriority::LOWEST );
pIdle->Start();
@@ -466,7 +466,7 @@ IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn, Button*, void)
}
-IMPL_LINK( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
+IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer, void)
{
if ( _pTimer )
{
@@ -738,7 +738,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
{
pData = _pData;
- aPreviewTimer.SetTimeoutHdl( LINK( this, TPGalleryThemeProperties, PreviewTimerHdl ) );
+ aPreviewTimer.SetInvokeHandler( LINK( this, TPGalleryThemeProperties, PreviewTimerHdl ) );
aPreviewTimer.SetTimeout( 500 );
m_pBtnSearch->SetClickHdl(LINK(this, TPGalleryThemeProperties, ClickSearchHdl));
m_pBtnTake->SetClickHdl(LINK(this, TPGalleryThemeProperties, ClickTakeHdl));
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 947a7e843b56..60ee026c8fd1 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -138,7 +138,7 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
{
bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
- maTimer.SetTimeoutHdl( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) );
+ maTimer.SetInvokeHandler( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) );
maTimer.SetTimeout( 5 );
get(mpPreview, "preview");
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index b4cb44e42680..5d970fe6c465 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -72,7 +72,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
m_pCbbPath->SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) );
- maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
+ maTimer.SetInvokeHandler ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
}
SvxHyperlinkDocTp::~SvxHyperlinkDocTp()
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 402fb9c6246b..9b6ff256b5f1 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
m_pEdLogin->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
m_pCbbTarget->SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
m_pCbbTarget->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
- maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
+ maTimer.SetInvokeHandler ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
}
SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp()
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1da650d9a322..f2161ec4947d 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -123,7 +123,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
m_pTbLinks->Resize(); // OS: hack for correct selection
// UpdateTimer for DDE-/Grf-links, which are waited for
- aUpdateIdle.SetIdleHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
+ aUpdateIdle.SetInvokeHandler( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateIdle.SetPriority( TaskPriority::LOWEST );
m_pPbOpenSource->Hide();
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
}
}
-IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void )
+IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, void )
{
m_pTbLinks->SetUpdateMode(false);
for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; )
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 3f831e7ba00e..4b8bad46d825 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -63,7 +63,7 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
{
EnableAutoSize(true);
- m_aModifyIdle.SetIdleHdl( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) );
+ m_aModifyIdle.SetInvokeHandler( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) );
m_aModifyIdle.SetPriority( TaskPriority::LOWEST );
EnableAutocomplete( false );
@@ -92,7 +92,7 @@ void LookUpComboBox::Modify()
m_aModifyIdle.Start();
}
-IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Idle *, void )
+IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Timer *, void )
{
m_pDialog->LookUp( GetText() );
m_aModifyIdle.Stop();
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 18ec128078f7..59776c8acb40 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -131,7 +131,7 @@ private:
bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
void ResetFromWallpaperItem( const SfxItemSet& rSet );
- DECL_LINK( LoadIdleHdl_Impl, Idle*, void );
+ DECL_LINK( LoadIdleHdl_Impl, Timer*, void );
DECL_LINK(SelectHdl_Impl, ListBox&, void );
DECL_LINK(BrowseHdl_Impl, Button*, void);
DECL_LINK( RadioClickHdl_Impl, Button*, void );
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index e537150d1c18..fcbbefe3a9c3 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -133,7 +133,7 @@ private:
void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
- DECL_LINK( UpdateHdl_Impl, Idle *, void );
+ DECL_LINK( UpdateHdl_Impl, Timer *, void );
DECL_LINK( FontModifyEditHdl_Impl, Edit&, void );
DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void );
DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void );
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 12014af5a6b2..07f26fdc021f 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -157,7 +157,7 @@ private:
GalleryProgress aStatusProgress;
DECL_LINK( ClickCancelBtn, Button*, void );
- DECL_LINK( TimeoutHdl, Idle*, void );
+ DECL_LINK( TimeoutHdl, Timer*, void );
DECL_LINK( ActualizeHdl, const INetURLObject&, void );
public:
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index fe52850394d7..cd236db2ab5a 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -71,7 +71,7 @@ class SvBaseLinksDlg : public ModalDialog
DECL_LINK( UpdateNowClickHdl, Button *, void);
DECL_LINK( ChangeSourceClickHdl, Button *, void );
DECL_LINK( BreakLinkClickHdl, Button *, void );
- DECL_LINK( UpdateWaitingHdl, Idle *, void );
+ DECL_LINK( UpdateWaitingHdl, Timer *, void );
DECL_LINK( EndEditHdl, sfx2::SvBaseLink&, void );
sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos );
OUString ImplGetStateStr( const sfx2::SvBaseLink& );
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 0c4636499b0e..3f37b3a260a2 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -43,7 +43,7 @@ class SfxMacroTabPage : public SfxTabPage
DECL_LINK( AssignDeleteHdl_Impl, SvTreeListBox*, bool );
DECL_LINK( AssignDeleteClickHdl_Impl, Button *, void );
bool AssignDeleteHdl(Control *);
- DECL_LINK( TimeOut_Impl, Idle*, void );
+ DECL_LINK( TimeOut_Impl, Timer*, void );
protected:
std::unique_ptr<SfxMacroTabPage_Impl> mpImpl;
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index a2fc7cca38c8..298c68f179de 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -45,7 +45,7 @@ public:
virtual ~LookUpComboBox() override;
virtual void dispose() override;
- DECL_LINK( ModifyTimer_Hdl, Idle *, void );
+ DECL_LINK( ModifyTimer_Hdl, Timer *, void );
void init(SvxThesaurusDialog *pDialog);
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 462160727641..871c43a493ad 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -185,7 +185,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
m_pAddBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) );
m_pParameterBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ParameterHdl_Impl ) );
m_pClassPathBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ClassPathHdl_Impl ) );
- m_aResetIdle.SetIdleHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
+ m_aResetIdle.SetInvokeHandler( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
m_aResetIdle.SetPriority(TaskPriority::LOWER);
m_pExpertConfigBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ExpertConfigHdl_Impl) );
@@ -390,7 +390,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void)
}
-IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void)
+IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Timer *, void)
{
LoadJREs();
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 4a4f7bbfd04a..50c5a9c347bd 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -90,7 +90,7 @@ private:
DECL_LINK( AddHdl_Impl, Button*, void);
DECL_LINK( ParameterHdl_Impl, Button*, void);
DECL_LINK( ClassPathHdl_Impl, Button*, void);
- DECL_LINK( ResetHdl_Impl, Idle *, void);
+ DECL_LINK( ResetHdl_Impl, Timer *, void);
DECL_LINK( StartFolderPickerHdl, void *, void );
DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 5858783970f9..f781f0c7e715 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -625,8 +625,6 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
In this case the condition of the preview button is saved.
*/
void SvxBackgroundTabPage::FillUserData()
-
-
{
SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') );
}
@@ -954,7 +952,7 @@ void SvxBackgroundTabPage::ShowSelector()
// delayed loading via timer (because of UI-Update)
pPageImpl->pLoadIdle = new Idle("DelayedLoad");
pPageImpl->pLoadIdle->SetPriority( TaskPriority::LOWEST );
- pPageImpl->pLoadIdle->SetIdleHdl(
+ pPageImpl->pLoadIdle->SetInvokeHandler(
LINK( this, SvxBackgroundTabPage, LoadIdleHdl_Impl ) );
bAllowShowSelector = false;
@@ -1255,7 +1253,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void)
Graphic is only loaded, if it's
different to the current graphic.
*/
-IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void )
+IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Timer*, pIdle, void )
{
if ( pIdle == pPageImpl->pLoadIdle )
{
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 240698f9ddfc..0ce4e2db0795 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -428,7 +428,7 @@ void SvxCharNamePage::Initialize()
m_pCTLFontSizeLB->SetModifyHdl( aLink );
m_pCTLFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyListBoxHdl_Impl ) );
- m_pImpl->m_aUpdateIdle.SetIdleHdl( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
+ m_pImpl->m_aUpdateIdle.SetInvokeHandler( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
}
@@ -1164,7 +1164,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
}
-IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Idle *, void)
+IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Timer *, void)
{
UpdatePreview_Impl();
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index a6972ef572ee..beef6ec36b7e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -119,7 +119,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
m_pOrigSizePB->SetClickHdl( LINK(this, SvxGrfCropPage, OrigSizeHdl) );
- aTimer.SetTimeoutHdl(LINK(this, SvxGrfCropPage, Timeout));
+ aTimer.SetInvokeHandler(LINK(this, SvxGrfCropPage, Timeout));
aTimer.SetTimeout( 1500 );
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 7485ad5c86a0..e2f241190067 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -137,7 +137,7 @@ SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >
{
mpImpl.reset(new SfxMacroTabPage_Impl);
- mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, SfxMacroTabPage, TimeOut_Impl ) );
+ mpImpl->maFillGroupIdle.SetInvokeHandler( LINK( this, SfxMacroTabPage, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetPriority( TaskPriority::HIGHEST );
mpImpl->maFillGroupIdle.SetDebugName( "SfxMacroTabPage maFillGroupIdle" );
@@ -363,7 +363,7 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
return false;
}
-IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
+IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Timer*,, void )
{
// FillMacroList() can take a long time -> show wait cursor and disable input
SfxTabDialog* pTabDlg = GetTabDialog();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index c3abc9ae85b5..ae6f6eaef8d3 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -363,7 +363,7 @@ void SvxNumberFormatTabPage::Init_Impl()
UpdateDecimalsDenominatorEditBox();
m_pEdComment->SetLoseFocusHdl( LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl) );
- aResetWinTimer.SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
+ aResetWinTimer.SetInvokeHandler(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
aResetWinTimer.SetTimeout( 10);
// initialize language ListBox
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index cd81e87e2185..a365cf607f0c 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1162,7 +1162,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
m_pSameLevelCB->SetClickHdl(LINK(this, SvxNumOptionsTabPage, SameLevelHdl_Impl));
m_pBulRelSizeMF->SetModifyHdl(LINK(this,SvxNumOptionsTabPage, BulRelSizeHdl_Impl));
m_pBulColLB->SetSelectHdl(LINK(this, SvxNumOptionsTabPage, BulColorHdl_Impl));
- aInvalidateTimer.SetTimeoutHdl(LINK(this, SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl));
+ aInvalidateTimer.SetInvokeHandler(LINK(this, SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl));
aInvalidateTimer.SetTimeout(50);
Menu *pBitmapMenu = m_pBitmapMB->GetPopupMenu();
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 08bb04ea36a5..6582b37fad1f 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -552,7 +552,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::
}
osl_atomic_decrement(&m_refCount);
- m_aInvalidateClipboard.SetTimeoutHdl(LINK(this, SbaXDataBrowserController, OnInvalidateClipboard));
+ m_aInvalidateClipboard.SetInvokeHandler(LINK(this, SbaXDataBrowserController, OnInvalidateClipboard));
m_aInvalidateClipboard.SetTimeout(300);
}
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index ccfca86880a6..f191ceee0ba8 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -72,7 +72,7 @@ void DBTreeListBox::init()
SetSpaceBetweenEntries(nSize);
m_aTimer.SetTimeout(900);
- m_aTimer.SetTimeoutHdl(LINK(this, DBTreeListBox, OnTimeOut));
+ m_aTimer.SetInvokeHandler(LINK(this, DBTreeListBox, OnTimeOut));
m_aScrollHelper.setUpScrollMethod( LINK(this, DBTreeListBox, ScrollUpHdl) );
m_aScrollHelper.setDownScrollMethod( LINK(this, DBTreeListBox, ScrollDownHdl) );
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 810a78a3bb01..fa80d16ce681 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -75,10 +75,10 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent ) :
SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) );
m_timerUndoActionCreation.SetTimeout(1000);
- m_timerUndoActionCreation.SetTimeoutHdl(LINK(this, OSqlEdit, OnUndoActionTimer));
+ m_timerUndoActionCreation.SetInvokeHandler(LINK(this, OSqlEdit, OnUndoActionTimer));
m_timerInvalidate.SetTimeout(200);
- m_timerInvalidate.SetTimeoutHdl(LINK(this, OSqlEdit, OnInvalidateTimer));
+ m_timerInvalidate.SetInvokeHandler(LINK(this, OSqlEdit, OnInvalidateTimer));
m_timerInvalidate.Start();
ImplSetFont();
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index c240f477b022..636d82e7f146 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -104,7 +104,7 @@ namespace dbaui
Construct();
- m_aResetVisitFlag.SetTimeoutHdl(LINK(this, OParameterDialog, OnVisitedTimeout));
+ m_aResetVisitFlag.SetInvokeHandler(LINK(this, OParameterDialog, OnVisitedTimeout));
}
OParameterDialog::~OParameterDialog()
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 03fb8bb71ef4..343f703a4d19 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -103,7 +103,7 @@ namespace dbaui
bool m_bTrackingInitiallyMoved;
- DECL_LINK(OnDragScrollTimer, Idle*, void);
+ DECL_LINK(OnDragScrollTimer, Timer*, void);
protected:
VclPtr<OTableWindow> m_pLastFocusTabWin;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 728903252df0..88fe2941e6cd 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -174,7 +174,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
InitColors();
- m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
+ m_aDragScrollIdle.SetInvokeHandler(LINK(this, OJoinTableView, OnDragScrollTimer));
}
OJoinTableView::~OJoinTableView()
@@ -1073,7 +1073,7 @@ void OJoinTableView::ScrollWhileDragging()
ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow );
}
-IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Idle *, void)
+IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Timer *, void)
{
ScrollWhileDragging();
}
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 8d421eefe09c..40ac61745126 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -146,7 +146,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
m_bVisibleRow[BROW_FUNCTION_ROW] = false; // first hide
m_timerInvalidate.SetTimeout(200);
- m_timerInvalidate.SetTimeoutHdl(LINK(this, OSelectionBrowseBox, OnInvalidateTimer));
+ m_timerInvalidate.SetInvokeHandler(LINK(this, OSelectionBrowseBox, OnInvalidateTimer));
m_timerInvalidate.Start();
}
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 0904e805b329..39e005747b9e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -242,7 +242,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
if( !m_aScrollTimer.IsActive() )
{
- m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) );
+ m_aScrollTimer.SetInvokeHandler( LINK(this, OTableWindowListBox, ScrollUpHdl) );
ScrollUpHdl( nullptr );
}
}
@@ -252,7 +252,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
if( !m_aScrollTimer.IsActive() )
{
- m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) );
+ m_aScrollTimer.SetInvokeHandler( LINK(this, OTableWindowListBox, ScrollDownHdl) );
ScrollDownHdl( nullptr );
}
}
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 23e0bd942c30..80519ed295da 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -78,7 +78,7 @@ OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(OTableEditorCtrl* _
{
m_aInvalidateTimer.SetTimeout(500);
- m_aInvalidateTimer.SetTimeoutHdl(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
+ m_aInvalidateTimer.SetInvokeHandler(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
m_aInvalidateTimer.Start();
}
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0fe6ba610e29..2048994f72e0 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -528,7 +528,7 @@ Desktop::Desktop()
, m_aBootstrapStatus(BS_OK)
{
m_firstRunTimer.SetTimeout(3000); // 3 sec.
- m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
+ m_firstRunTimer.SetInvokeHandler(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.SetDebugName( "desktop::Desktop m_firstRunTimer" );
}
@@ -2583,7 +2583,7 @@ void Desktop::CloseSplashScreen()
}
-IMPL_STATIC_LINK(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
+IMPL_STATIC_LINK_NOARG(Desktop, AsyncInitFirstRun, Timer *, void)
{
// does initializations which are necessary for the first run of the office
try
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 04a025984b5e..e81ff2c6734e 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -522,7 +522,7 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager,
#endif
m_aIdle.SetPriority(TaskPriority::LOWEST);
- m_aIdle.SetIdleHdl( LINK( this, ExtMgrDialog, TimeOutHdl ) );
+ m_aIdle.SetInvokeHandler( LINK( this, ExtMgrDialog, TimeOutHdl ) );
}
@@ -948,7 +948,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, Button*, void)
#endif
}
-IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Timer *, void)
{
if ( m_bStopProgress )
{
@@ -1066,7 +1066,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan
m_pCloseBtn->GrabFocus();
m_aIdle.SetPriority( TaskPriority::LOWEST );
- m_aIdle.SetIdleHdl( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
+ m_aIdle.SetInvokeHandler( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
}
UpdateRequiredDialog::~UpdateRequiredDialog()
@@ -1258,7 +1258,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn, Button*, void)
}
-IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Timer *, void)
{
if ( m_bStopProgress )
{
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 0f0b54f4b261..8019edc9d330 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -143,7 +143,7 @@ class ExtMgrDialog : public ModelessDialog,
DECL_LINK( HandleCancelBtn, Button*, void );
DECL_LINK( HandleCloseBtn, Button*, void );
DECL_LINK( HandleExtTypeCbx, Button*, void );
- DECL_LINK(TimeOutHdl, Idle *, void);
+ DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK( startProgress, void *, void );
DECL_STATIC_LINK( ExtMgrDialog, Restart, void *, void );
@@ -216,7 +216,7 @@ class UpdateRequiredDialog : public ModalDialog,
DECL_LINK( HandleUpdateBtn, Button*, void );
DECL_LINK( HandleCloseBtn, Button*, void );
DECL_LINK( HandleCancelBtn, Button*, void );
- DECL_LINK(TimeOutHdl, Idle *, void);
+ DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK( startProgress, void *, void );
static bool isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index b47421f91916..1b585f7bbfe7 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -676,7 +676,7 @@ private:
inline void EraseVirtualDevice() { pVirtDev.disposeAndClear(); }
DECL_LINK( StatusTimerHdl, Timer *, void);
- DECL_LINK( IdleFormatHdl, Idle *, void);
+ DECL_LINK( IdleFormatHdl, Timer *, void);
DECL_LINK( OnlineSpellHdl, Timer *, void);
DECL_LINK( DocModified, LinkParamNone*, void );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index fc2b2aa1f4bc..0d89b4344669 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -145,15 +145,15 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
aSelEngine.SetFunctionSet( &aSelFuncSet );
aStatusTimer.SetTimeout( 200 );
- aStatusTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, StatusTimerHdl ) );
+ aStatusTimer.SetInvokeHandler( LINK( this, ImpEditEngine, StatusTimerHdl ) );
aStatusTimer.SetDebugName( "editeng::ImpEditEngine aStatusTimer" );
aIdleFormatter.SetPriority( TaskPriority::REPAINT );
- aIdleFormatter.SetIdleHdl( LINK( this, ImpEditEngine, IdleFormatHdl ) );
+ aIdleFormatter.SetInvokeHandler( LINK( this, ImpEditEngine, IdleFormatHdl ) );
aIdleFormatter.SetDebugName( "editeng::ImpEditEngine aIdleFormatter" );
aOnlineSpellTimer.SetTimeout( 100 );
- aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
+ aOnlineSpellTimer.SetInvokeHandler( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
aOnlineSpellTimer.SetDebugName( "editeng::ImpEditEngine aOnlineSpellTimer" );
// Access data already from here on!
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 59022d7fa599..c6f4e4d3e1fd 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -311,7 +311,7 @@ IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl, Timer *, void)
aOnlineSpellTimer.Start();
}
-IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Idle *, void)
+IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Timer *, void)
{
aIdleFormatter.ResetRestarts();
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 34292481a8b4..cf0c2625c7c2 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -120,7 +120,7 @@ BibBookContainer::BibBookContainer(vcl::Window* pParent):
aIdle("extensions BibBookContainer Split Idle")
{
pBibMod = OpenBibModul();
- aIdle.SetIdleHdl(LINK( this, BibBookContainer, SplitHdl));
+ aIdle.SetInvokeHandler(LINK( this, BibBookContainer, SplitHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
}
@@ -160,7 +160,7 @@ void BibBookContainer::Split()
{
aIdle.Start();
}
-IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Idle*, void)
+IMPL_LINK_NOARG( BibBookContainer, SplitHdl, Timer*, void)
{
long nSize= GetItemSize( TOP_WINDOW);
BibConfig* pConfig = BibModul::GetConfig();
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 028cfff8fc11..996c408340ef 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -72,7 +72,7 @@ class BibBookContainer: public BibSplitWindow
HdlBibModul pBibMod;
Idle aIdle;
- DECL_LINK( SplitHdl, Idle*, void );
+ DECL_LINK( SplitHdl, Timer*, void );
protected:
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index b62a03c0e1a9..7afd21011ed4 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -201,7 +201,7 @@ BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink)
SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
- aIdle.SetIdleHdl(LINK( this, BibToolBar, SendSelHdl));
+ aIdle.SetInvokeHandler(LINK( this, BibToolBar, SendSelHdl));
aIdle.SetPriority(TaskPriority::LOWEST);
SetDropdownClickHdl( LINK( this, BibToolBar, MenuHdl));
@@ -471,7 +471,7 @@ IMPL_LINK_NOARG( BibToolBar, SelHdl, ListBox&, void )
aIdle.Start();
}
-IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Idle*, void )
+IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Timer*, void )
{
Sequence<PropertyValue> aPropVal(1);
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index c1dbe7bd0abc..117de636d5f3 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -134,7 +134,7 @@ class BibToolBar: public ToolBox
BibDataManager* pDatMan;
DECL_LINK( SelHdl, ListBox&, void );
- DECL_LINK( SendSelHdl, Idle*, void );
+ DECL_LINK( SendSelHdl, Timer*, void );
DECL_LINK( MenuHdl, ToolBox*, void );
DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void );
DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d8f3a036a8e6..16bba2d55dbb 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -140,7 +140,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper
private:
DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool);
- DECL_LINK(WaitTimeOutHdl, Idle *, void);
+ DECL_LINK(WaitTimeOutHdl, Timer *, void);
DECL_LINK(TimeOutHdl, Timer *, void);
DECL_LINK(UserEventHdl, void *, void);
DECL_LINK(WindowEventHdl, VclWindowEvent&, void);
@@ -207,10 +207,10 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
maBubbleImage = GetBubbleImage( maBubbleImageURL );
maWaitIdle.SetPriority( TaskPriority::LOWEST );
- maWaitIdle.SetIdleHdl( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
+ maWaitIdle.SetInvokeHandler( LINK( this, UpdateCheckUI, WaitTimeOutHdl ) );
maTimeoutTimer.SetTimeout( 10000 );
- maTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateCheckUI, TimeOutHdl ) );
+ maTimeoutTimer.SetInvokeHandler( LINK( this, UpdateCheckUI, TimeOutHdl ) );
uno::Reference< document::XDocumentEventBroadcaster > xBroadcaster( frame::theGlobalEventBroadcaster::get(m_xContext) );
xBroadcaster->addDocumentEventListener( this );
@@ -601,7 +601,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rDat
}
-IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Timer *, void)
{
SolarMutexGuard aGuard;
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index dfa72246951a..2cad1f8431fa 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2534,7 +2534,7 @@ void ODatabaseForm::impl_createLoadTimer()
OSL_PRECOND( m_pLoadTimer == nullptr, "ODatabaseForm::impl_createLoadTimer: timer already exists!" );
m_pLoadTimer = new Timer("DatabaseFormLoadTimer");
m_pLoadTimer->SetTimeout(100);
- m_pLoadTimer->SetTimeoutHdl(LINK(this,ODatabaseForm,OnTimeout));
+ m_pLoadTimer->SetInvokeHandler(LINK(this,ODatabaseForm,OnTimeout));
}
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 8a7276c8dd31..6874feb25059 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1799,7 +1799,7 @@ namespace frm
doSetDelegator();
m_aChangeIdle.SetPriority(TaskPriority::LOWEST);
- m_aChangeIdle.SetIdleHdl(LINK(this,OListBoxControl,OnTimeout));
+ m_aChangeIdle.SetInvokeHandler(LINK(this,OListBoxControl,OnTimeout));
}
@@ -1984,7 +1984,7 @@ namespace frm
}
- IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Idle*, void)
+ IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Timer*, void)
{
m_aChangeListeners.notifyEach( &XChangeListener::changed, EventObject( *this ) );
}
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 3946d33edfb4..f12391e00817 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -327,7 +327,7 @@ protected:
virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override;
private:
- DECL_LINK( OnTimeout, Idle*, void );
+ DECL_LINK( OnTimeout, Timer*, void );
};
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index a0eacea77068..d795395884f7 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -352,11 +352,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
FormulaDlg_Impl::~FormulaDlg_Impl()
{
- if(aIdle.IsActive())
+ if (aIdle.IsActive())
{
- aIdle.SetIdleHdl(Link<Idle *, void>());
+ aIdle.ClearInvokeHandler();
aIdle.Stop();
- }// if(aIdle.IsActive())
+ }
bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus.
m_pTabCtrl->RemovePage(TP_FUNCTION);
@@ -1802,7 +1802,7 @@ void FormulaDlg::Update()
{
m_pImpl->Update();
m_pImpl->aIdle.SetPriority(TaskPriority::LOWER);
- m_pImpl->aIdle.SetIdleHdl(LINK( this, FormulaDlg, UpdateFocusHdl));
+ m_pImpl->aIdle.SetInvokeHandler(LINK( this, FormulaDlg, UpdateFocusHdl));
m_pImpl->aIdle.Start();
}
@@ -1876,7 +1876,7 @@ void FormulaDlg::SetEdSelection()
m_pImpl->SetEdSelection();
}
-IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Idle *, void)
+IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Timer *, void)
{
FormEditData* pData = m_pImpl->m_pHelper->getFormEditData();
if (!pData)
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 6472fdebcb1d..685381fadb1c 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -408,7 +408,7 @@ RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits
, pAnyRefDlg( nullptr )
, pLabelWidget(pShrinkModeLabel)
{
- aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
+ aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) );
aIdle.SetPriority( TaskPriority::LOW );
}
@@ -425,7 +425,7 @@ RefEdit::~RefEdit()
void RefEdit::dispose()
{
- aIdle.SetIdleHdl( Link<Idle *, void>() );
+ aIdle.ClearInvokeHandler();
aIdle.Stop();
pLabelWidget.clear();
Edit::dispose();
@@ -477,12 +477,12 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel
if( pDlg )
{
- aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
+ aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) );
aIdle.SetPriority( TaskPriority::LOW );
}
else
{
- aIdle.SetIdleHdl( Link<Idle *, void>() );
+ aIdle.ClearInvokeHandler();
aIdle.Stop();
}
}
@@ -516,7 +516,7 @@ void RefEdit::LoseFocus()
pAnyRefDlg->HideReference();
}
-IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void)
+IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void)
{
if( pAnyRefDlg )
pAnyRefDlg->ShowReference( GetText() );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2eef55d9af50..25d00008d12a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -690,7 +690,7 @@ void SvtFileDialog::Init_Impl
// set timer for the filterbox travel
pImpl->_aFilterTimer.SetTimeout( TRAVELFILTER_TIMEOUT );
- pImpl->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) );
+ pImpl->_aFilterTimer.SetInvokeHandler( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) );
if ( PickerFlags::SaveAs & nStyle )
{
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index d78a4a75120b..85304a1775bc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -139,7 +139,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
}
m_aAsyncLayoutTimer.SetTimeout( 50 );
- m_aAsyncLayoutTimer.SetTimeoutHdl( LINK( this, LayoutManager, AsyncLayoutHdl ) );
+ m_aAsyncLayoutTimer.SetInvokeHandler( LINK( this, LayoutManager, AsyncLayoutHdl ) );
m_aAsyncLayoutTimer.SetDebugName( "framework::LayoutManager m_aAsyncLayoutTimer" );
registerProperty( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS, LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS, css::beans::PropertyAttribute::TRANSIENT, &m_bAutomaticToolbars, cppu::UnoType<decltype(m_bAutomaticToolbars)>::get() );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 6d232a579bab..cd74f30d07f0 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1255,7 +1255,7 @@ void AutoRecovery::initListeners()
// establish callback for our internal used timer.
// Note: Its only active, if the timer will be started ...
SolarMutexGuard g;
- m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired));
+ m_aTimer.SetInvokeHandler(LINK(this, AutoRecovery, implts_timerExpired));
}
AutoRecovery::~AutoRecovery()
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index d776a5c215c8..f9a5ebd24676 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -945,7 +945,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu, bool )
// Start timer to handle settings asynchronous
// Changing the menu inside this handler leads to
// a crash under X!
- m_aAsyncSettingsTimer.SetTimeoutHdl(LINK(this, MenuBarManager, AsyncSettingsHdl));
+ m_aAsyncSettingsTimer.SetInvokeHandler(LINK(this, MenuBarManager, AsyncSettingsHdl));
m_aAsyncSettingsTimer.SetTimeout(10);
m_aAsyncSettingsTimer.Start();
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index e3bd0d15b9d1..4b9768d88ab2 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -192,7 +192,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_pToolBar->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
- m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
+ m_aAsyncUpdateControllersTimer.SetInvokeHandler( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
m_aAsyncUpdateControllersTimer.SetDebugName( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" );
SvtMiscOptions().AddListenerLink( LINK( this, ToolBarManager, MiscOptionsChanged ) );
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 8ef48eaf3051..164c673fe6d1 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -107,7 +107,7 @@ public:
private:
::std::unique_ptr<FormulaDlg_Impl> m_pImpl;
- DECL_LINK( UpdateFocusHdl, Idle*, void );
+ DECL_LINK( UpdateFocusHdl, Timer*, void );
protected:
void disableOk();
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 99a3e4e71325..5bb490d648a2 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -47,7 +47,7 @@ private:
IControlReferenceHandler* pAnyRefDlg; // parent dialog
VclPtr<vcl::Window> pLabelWidget;
- DECL_LINK( UpdateHdl, Idle*, void );
+ DECL_LINK( UpdateHdl, Timer*, void );
protected:
virtual void KeyInput( const KeyEvent& rKEvt ) override;
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 1ed1eb4166ac..b5c06c515e16 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -105,7 +105,7 @@ public:
SfxBindings& GetBindings()
{ return *pBindings; }
- DECL_LINK(TimerHdl, Idle *, void);
+ DECL_LINK(TimerHdl, Timer *, void);
};
@@ -145,7 +145,7 @@ public:
virtual void FillInfo(SfxChildWinInfo&) const;
void Initialize (SfxChildWinInfo* pInfo);
- DECL_LINK(TimerHdl, Idle *, void);
+ DECL_LINK(TimerHdl, Timer *, void);
};
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 9ffbb3370e94..bea1e06311d8 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -420,8 +420,8 @@ private:
DECL_LINK( BoxLoseFocusHdl, Control&, void );
//add lose focus handlers of Date/TimeField?
- DECL_LINK(EditTimeoutHdl, Idle *, void);
- DECL_LINK(BoxTimeoutHdl, Idle *, void);
+ DECL_LINK(EditTimeoutHdl, Timer *, void);
+ DECL_LINK(BoxTimeoutHdl, Timer *, void);
bool IsLineValid( CustomPropertyLine* pLine ) const;
void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox );
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index a172ced137de..441254a5490f 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -91,7 +91,7 @@ friend class SfxStateCache;
friend class SfxPopupMenuManager;
friend class SfxHelp;
- DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void );
+ DECL_DLLPRIVATE_LINK( EventHdl_Impl, Timer *, void );
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void );
SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index cadc84000ab1..d9b3109e4466 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -99,7 +99,7 @@ public:
void SetMinOutputSizePixel( const Size& rSize );
const Size& GetMinOutputSizePixel() const;
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
- DECL_LINK(TimerHdl, Idle *, void);
+ DECL_LINK(TimerHdl, Timer *, void);
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index ceee99b4bacc..d037504b0464 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -26,6 +26,7 @@
#include <osl/mutex.hxx>
class Idle;
+class Timer;
struct ImplSVEvent;
namespace svtools {
@@ -40,7 +41,7 @@ class SVT_DLLPUBLIC AsynchronLink
void* _pArg;
::osl::Mutex* _pMutex;
- DECL_DLLPRIVATE_LINK( HandleCall_Idle, Idle*, void );
+ DECL_DLLPRIVATE_LINK( HandleCall_Idle, Timer*, void );
DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void*, void );
SVT_DLLPRIVATE void Call_Impl( void* pArg );
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index 0a1bc42b9200..f9634e18919b 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -32,7 +32,7 @@ private:
::std::function<void ()> mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
- DECL_LINK(TimerHandler, Idle *, void);
+ DECL_LINK(TimerHandler, Timer *, void);
public:
void resetTimer();
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index da18634d1f4e..c4e9d8847e45 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -790,7 +790,7 @@ class SvInplaceEdit2
bool bAlreadyInCallBack;
void CallCallBackHdl_Impl();
- DECL_LINK( Timeout_Impl, Idle *, void );
+ DECL_LINK( Timeout_Impl, Timer *, void );
DECL_LINK( ReturnHdl_Impl, Accelerator&, void );
DECL_LINK( EscapeHdl_Impl, Accelerator&, void );
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 9f9ffe177738..cd21d66c4fb8 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -203,7 +203,7 @@ private:
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
- DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Timer*, void );
protected:
long LogicalCoordinateToPixel(int iCoordinate);
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 83d1f3c11ec3..1bb4359f2117 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -147,7 +147,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
DECL_LINK( SelectShadowHdl_Impl, ToolBox *, void );
DECL_LINK( ModifyInputHdl_Impl, Edit&, void );
- DECL_LINK( InputTimoutHdl_Impl, Idle *, void );
+ DECL_LINK( InputTimoutHdl_Impl, Timer *, void );
DECL_LINK( ColorSelectHdl_Impl, SvxColorListBox&, void );
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index b4dab163f1c8..05e752430126 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
bool bAnim;
bool mbInIdleUpdate;
- DECL_LINK( UpdateHdl, Idle*, void );
+ DECL_LINK( UpdateHdl, Timer*, void );
rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 284b38fd30f7..e328ab8b1e78 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
DECL_LINK( URLModifyHdl, Edit&, void );
DECL_LINK( URLModifyComboBoxHdl, ComboBox&, void );
DECL_LINK( URLLoseFocusHdl, Control&, void );
- DECL_LINK( UpdateHdl, Idle *, void );
+ DECL_LINK( UpdateHdl, Timer *, void );
DECL_LINK( StateHdl, GraphCtrl*, void );
DECL_LINK( MiscHdl, LinkParamNone*, void );
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index d820fb21cb39..37bfc7af3f03 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -43,7 +43,7 @@ public:
SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
private: // Links
- DECL_LINK( OnTimer, Idle *, void );
+ DECL_LINK( OnTimer, Timer *, void );
private: // Functions
void _repaint();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index bc63ae1033fd..1c2da29a55ee 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
void init();
protected:
- DECL_LINK(FormatHdl_Impl, Idle *, void);
+ DECL_LINK(FormatHdl_Impl, Timer *, void);
public:
SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits);
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 7492b887d41f..856785eb8cdf 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -28,7 +28,7 @@ private:
Idle m_aPanelLayoutIdle;
bool m_bInClose;
- DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void);
+ DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Timer*, void);
public:
PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index dcf686230561..52b9b904d9e9 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -221,7 +221,7 @@ public:
private:
SVX_DLLPRIVATE void ImpClearVars();
- DECL_LINK(ImpComeBackHdl, Idle*, void);
+ DECL_LINK(ImpComeBackHdl, Timer*, void);
protected:
sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index c6d8fdb065f9..4d9c48963e93 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -242,7 +242,7 @@ private:
SAL_DLLPRIVATE void ImplInitDockingWindowData();
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
- DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void );
DockingWindow (const DockingWindow &) = delete;
DockingWindow & operator= (const DockingWindow &) = delete;
diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index 8d79c2f92527..707cc1248872 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -45,21 +45,8 @@ public:
Idle( const sal_Char *pDebugName = nullptr );
virtual void Start() override;
-
- /**
- * Convenience function for more readable code
- *
- * TODO: actually rename it and it's instances to SetInvokeHandler
- */
- inline void SetIdleHdl( const Link<Idle *, void>& rLink );
};
-inline void Idle::SetIdleHdl( const Link<Idle*, void> &rLink )
-{
- SetInvokeHandler( Link<Timer*, void>( rLink.GetInstance(),
- reinterpret_cast< Link<Timer*, void>::Stub* >( rLink.GetFunction()) ) );
-}
-
#endif // INCLUDED_VCL_IDLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index a0c3b6972059..ac7a0d765c26 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -177,7 +177,7 @@ public:
private:
SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin );
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
- DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Timer*, void );
protected:
// Single argument ctors shall be explicit.
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 43fb1e245665..af678144e3e3 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -167,7 +167,7 @@ protected:
void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
- DECL_LINK( IdleFormatHdl, Idle *, void );
+ DECL_LINK( IdleFormatHdl, Timer *, void );
void CheckIdleFormatter();
void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 );
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index e7d539fdabf4..49d9aa7fb4a3 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -57,24 +57,13 @@ public:
void Invoke( Timer *arg );
void SetInvokeHandler( const Link<Timer *, void>& rLink ) { maInvokeHandler = rLink; }
bool HasInvokeHandler() const { return maInvokeHandler.IsSet(); };
-
- /**
- * Convenience function for more readable code
- *
- * TODO: actually use SetInvokeHandler and drop it
- */
- inline void SetTimeoutHdl( const Link<Timer *, void>& rLink );
+ void ClearInvokeHandler() { SetInvokeHandler( Link<Timer *, void>() ); }
void SetTimeout( sal_uInt64 nTimeoutMs );
sal_uInt64 GetTimeout() const { return mnTimeout; }
virtual void Start() override;
};
-inline void Timer::SetTimeoutHdl( const Link<Timer *, void>& rLink )
-{
- SetInvokeHandler( rLink );
-}
-
/// An auto-timer is a multi-shot timer re-emitting itself at
/// interval until destroyed.
class VCL_DLLPUBLIC AutoTimer : public Timer
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 083e6e602096..3dbcb3441547 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -210,7 +210,7 @@ private:
SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem );
DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void*, void );
- DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent&, void );
DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, Timer*, void );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 1b5759b23f12..ae214c294cae 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -531,11 +531,11 @@ private:
public:
- DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void*, void );
DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void*, void );
- DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Timer*, void );
SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow );
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index e7028ee9ff5f..4cc4fa7c8b9f 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -448,7 +448,7 @@ LngSvcMgr::LngSvcMgr()
UpdateAll();
aUpdateIdle.SetPriority(TaskPriority::LOWEST);
- aUpdateIdle.SetIdleHdl(LINK(this, LngSvcMgr, updateAndBroadcast));
+ aUpdateIdle.SetInvokeHandler(LINK(this, LngSvcMgr, updateAndBroadcast));
// request to be notified if an extension has been added/removed
uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
@@ -496,7 +496,7 @@ void LngSvcMgr::modified(const lang::EventObject&)
//needs to be run in the main thread because
//utl::ConfigChangeListener_Impl::changesOccurred grabs the SolarMutex and we
//get notified that an extension was added from an extension manager thread
-IMPL_LINK_NOARG(LngSvcMgr, updateAndBroadcast, Idle *, void)
+IMPL_LINK_NOARG(LngSvcMgr, updateAndBroadcast, Timer *, void)
{
osl::MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 348ca0905a0e..75b4c1ca1b1e 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -127,7 +127,7 @@ class LngSvcMgr :
void UpdateAll();
void stopListening();
- DECL_LINK( updateAndBroadcast, Idle*, void );
+ DECL_LINK( updateAndBroadcast, Timer*, void );
public:
LngSvcMgr();
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 62885daaad6a..02fe768a4f91 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -242,7 +242,7 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll
SetSelectionMode(SelectionMode::Multiple);
Clear();
- m_aDropActionTimer.SetTimeoutHdl(LINK(this, NavigatorTree, OnDropActionTimer));
+ m_aDropActionTimer.SetInvokeHandler(LINK(this, NavigatorTree, OnDropActionTimer));
SetSelectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
}
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 6f9a4d84a412..1098fae8badb 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -76,7 +76,7 @@ namespace rptui
bool m_bDeleted;
- DECL_LINK(MarkTimeout, Idle *, void);
+ DECL_LINK(MarkTimeout, Timer *, void);
DECL_LINK( SplitHdl, SplitWindow*, void );
void ImplInitSettings();
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index bddccde740a3..122d907281db 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -117,7 +117,7 @@ ODesignView::ODesignView( vcl::Window* pParent,
m_aSplitWin->Show();
m_aMarkIdle.SetPriority( TaskPriority::LOW );
- m_aMarkIdle.SetIdleHdl( LINK( this, ODesignView, MarkTimeout ) );
+ m_aMarkIdle.SetInvokeHandler( LINK( this, ODesignView, MarkTimeout ) );
}
@@ -265,7 +265,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
}
-IMPL_LINK_NOARG(ODesignView, MarkTimeout, Idle *, void)
+IMPL_LINK_NOARG(ODesignView, MarkTimeout, Timer *, void)
{
if ( m_pPropWin && m_pPropWin->IsVisible() )
{
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 3830ff0fd290..1502d62d724d 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -121,7 +121,7 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
, m_bUiActive(false)
, m_bShowPropertyBrowser(false)
{
- aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
+ aScrollTimer.SetInvokeHandler( LINK( this, DlgEdFunc, ScrollTimeout ) );
m_rView.SetActualWin( m_pParent);
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
}
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 5037236ffece..c461867eae5a 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -145,7 +145,7 @@ private:
Idle aIdle;
ScDocument* pDoc;
- DECL_LINK(TimerHdl, Idle *, void);
+ DECL_LINK(TimerHdl, Timer *, void);
ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7ceb1212dd1d..3f494b7dca6f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2028,7 +2028,7 @@ private:
SCCOLROW nEndCol, SCCOLROW* pTranslate,
ScProgress* pProgress, sal_uLong nProAdd );
- DECL_LINK(TrackTimeHdl, Idle *, void);
+ DECL_LINK(TrackTimeHdl, Timer *, void);
static ScRecursionHelper* CreateRecursionHelperInstance();
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 15ddc133fdf0..b57a208e297d 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -124,7 +124,7 @@ public:
// moved by the application
DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle
- DECL_LINK( SpellTimerHdl, Idle*, void );
+ DECL_LINK( SpellTimerHdl, Timer*, void );
DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
void Execute( SfxRequest& rReq );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index a5bf84093710..64e7d10a4aa5 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -248,7 +248,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) :
// languages for a visible document are set by docshell later (from options)
SetLanguage( ScGlobal::eLnge, ScGlobal::eLnge, ScGlobal::eLnge );
- aTrackIdle.SetIdleHdl( LINK( this, ScDocument, TrackTimeHdl ) );
+ aTrackIdle.SetInvokeHandler( LINK( this, ScDocument, TrackTimeHdl ) );
aTrackIdle.SetPriority( TaskPriority::LOW );
}
@@ -321,7 +321,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
pChangeTrack = pTrack;
}
-IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Idle *, void)
+IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Timer *, void)
{
if ( ScDdeLink::IsInUpdate() ) // do not nest
{
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 9bbd432a6e05..96bf26a26a6c 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -402,7 +402,7 @@ ScChartHiddenRangeListener::~ScChartHiddenRangeListener()
void ScChartListenerCollection::Init()
{
- aIdle.SetIdleHdl( LINK( this, ScChartListenerCollection, TimerHdl ) );
+ aIdle.SetInvokeHandler( LINK( this, ScChartListenerCollection, TimerHdl ) );
aIdle.SetPriority( TaskPriority::REPAINT );
aIdle.SetDebugName( "sc::ScChartListenerCollection aIdle" );
}
@@ -597,7 +597,7 @@ void ScChartListenerCollection::StartTimer()
aIdle.Start();
}
-IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Idle *, void)
+IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Timer *, void)
{
if ( Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index 8d3b59145369..95a398e1538a 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -146,7 +146,7 @@ ScTemporaryChartLock::ScTemporaryChartLock( ScDocument* pDocP ) :
mpDoc( pDocP )
{
maTimer.SetTimeout( SC_CHARTLOCKTIMEOUT );
- maTimer.SetTimeoutHdl( LINK( this, ScTemporaryChartLock, TimeoutHdl ) );
+ maTimer.SetInvokeHandler( LINK( this, ScTemporaryChartLock, TimeoutHdl ) );
}
ScTemporaryChartLock::~ScTemporaryChartLock()
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 954c132d25c3..6a48501e9c03 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -91,7 +91,7 @@ void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp )
void ScRefreshTimer::SetRefreshHandler( const Link<Timer *, void>& rLink )
{
- SetTimeoutHdl( rLink );
+ SetInvokeHandler( rLink );
}
sal_uLong ScRefreshTimer::GetRefreshDelay() const
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b823998e5bdb..7e3c8a7e6130 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -648,7 +648,7 @@ ScInputHandler::ScInputHandler()
pDelayTimer = new Timer( "ScInputHandlerDelay timer" );
pDelayTimer->SetTimeout( 500 ); // 500 ms delay
- pDelayTimer->SetTimeoutHdl( LINK( this, ScInputHandler, DelayTimer ) );
+ pDelayTimer->SetInvokeHandler( LINK( this, ScInputHandler, DelayTimer ) );
}
ScInputHandler::~ScInputHandler()
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 1bf3cba85b87..23042c406f3b 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -180,11 +180,11 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
GetResMgr() );
aSpellIdle.SetPriority(TaskPriority::LOWER);
- aSpellIdle.SetIdleHdl( LINK( this, ScModule, SpellTimerHdl ) );
+ aSpellIdle.SetInvokeHandler( LINK( this, ScModule, SpellTimerHdl ) );
aSpellIdle.SetDebugName( "sc::ScModule aSpellIdle" );
aIdleTimer.SetTimeout(SC_IDLE_MIN);
- aIdleTimer.SetTimeoutHdl( LINK( this, ScModule, IdleHandler ) );
+ aIdleTimer.SetInvokeHandler( LINK( this, ScModule, IdleHandler ) );
aIdleTimer.SetDebugName( "sc::ScModule aIdleTimer" );
aIdleTimer.Start();
@@ -1905,7 +1905,7 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void)
aIdleTimer.Start();
}
-IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Timer *, void)
{
if ( Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index d99765300abd..68afaffb9451 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -53,7 +53,7 @@ ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pPa
mnMenuPos(MENU_NOT_SELECTED),
mpParent(pParent)
{
- maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) );
+ maTimer.SetInvokeHandler( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) );
maTimer.SetTimeout(mpParent->GetSettings().GetMouseSettings().GetMenuDelay());
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index f1b055697e94..5021cf2f9710 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -108,7 +108,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar
// Hack: RefInput control
pTimer = new Timer("ScFilterTimer");
pTimer->SetTimeout( 50 ); // Wait 50ms
- pTimer->SetTimeoutHdl( LINK( this, ScFilterDlg, TimeOutHdl ) );
+ pTimer->SetInvokeHandler( LINK( this, ScFilterDlg, TimeOutHdl ) );
}
ScFilterDlg::~ScFilterDlg()
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 5148a7cd059b..4f5eca4ba884 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -89,7 +89,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc
pIdle = new Idle;
// FIXME: this is an abomination
pIdle->SetPriority( TaskPriority::LOWEST );
- pIdle->SetIdleHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
+ pIdle->SetInvokeHandler( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
pIdle->Start();
}
@@ -396,7 +396,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void )
}
}
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void )
+IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, void )
{
// every 50ms check whether RefInputMode is still true
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 355d5b7851df..68cae217c652 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -63,8 +63,8 @@ ScAutoStyleList::ScAutoStyleList(ScDocShell* pShell)
, aInitIdle("ScAutoStyleList InitIdle")
, nTimerStart(0)
{
- aTimer.SetTimeoutHdl( LINK( this, ScAutoStyleList, TimerHdl ) );
- aInitIdle.SetIdleHdl( LINK( this, ScAutoStyleList, InitHdl ) );
+ aTimer.SetInvokeHandler( LINK( this, ScAutoStyleList, TimerHdl ) );
+ aInitIdle.SetInvokeHandler( LINK( this, ScAutoStyleList, InitHdl ) );
aInitIdle.SetPriority( TaskPriority::HIGHEST );
}
@@ -81,7 +81,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1
aInitIdle.Start();
}
-IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Idle *, void)
+IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Timer *, void)
{
std::vector<ScAutoStyleInitData>::iterator iter;
for (iter = aInitials.begin(); iter != aInitials.end(); ++iter)
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 367b73c2a842..d42382478a7b 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -317,7 +317,7 @@ DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange&
mbIsUpdate(false)
{
maImportTimer.SetTimeout(0);
- maImportTimer.SetTimeoutHdl( LINK(this, DataStream, ImportTimerHdl) );
+ maImportTimer.SetInvokeHandler( LINK(this, DataStream, ImportTimerHdl) );
Decode(rURL, rRange, nLimit, eMove, nSettings);
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 42c17b937db9..94b8752f429e 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1681,7 +1681,7 @@ ScExternalRefManager::ScExternalRefManager(ScDocument* pDoc) :
mbUserInteractionEnabled(true),
mbDocTimerEnabled(true)
{
- maSrcDocTimer.SetTimeoutHdl( LINK(this, ScExternalRefManager, TimeOutHdl) );
+ maSrcDocTimer.SetInvokeHandler( LINK(this, ScExternalRefManager, TimeOutHdl) );
maSrcDocTimer.SetTimeout(SRCDOC_SCAN_INTERVAL);
maSrcDocTimer.SetDebugName( "sc::ScExternalRefManager maSrcDocTimer" );
}
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 03a6646b57b7..b5632ea7a02d 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -42,10 +42,10 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
// remember MouseButton state
mnCode(0)
{
- aScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, ScrollHdl) );
+ aScrollTimer.SetInvokeHandler( LINK(this, FuPoor, ScrollHdl) );
aScrollTimer.SetTimeout(SELENG_AUTOREPEAT_INTERVAL);
- aDragTimer.SetTimeoutHdl( LINK(this, FuPoor, DragTimerHdl) );
+ aDragTimer.SetInvokeHandler( LINK(this, FuPoor, DragTimerHdl) );
aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT);
}
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index eff8461682fe..10f50fddccaf 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -104,10 +104,10 @@ private:
DECL_LINK( SelectHandle, SvTreeListBox*, void );
DECL_LINK( RefInfoHandle, const OUString*, void );
- DECL_LINK( UpdateSelectionHdl, Idle*, void );
+ DECL_LINK( UpdateSelectionHdl, Timer*, void );
DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void );
DECL_LINK( CommandHdl, SvSimpleTable*, void );
- DECL_LINK( ReOpenTimerHdl, Idle*, void );
+ DECL_LINK( ReOpenTimerHdl, Timer*, void );
DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 );
protected:
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 963036a1d7ef..03cbaeb182a8 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -120,7 +120,7 @@ private:
Idle aIdle;
OUString aDocName; // document on which the dialog was opened
- DECL_LINK( UpdateFocusHdl, Idle*, void );
+ DECL_LINK( UpdateFocusHdl, Timer*, void );
protected:
void disposeRefHandler();
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index ff078209911b..d84f7a2a077e 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -64,7 +64,7 @@ private:
void AdjustEntries(sal_uLong nDiff);
void StartTimer(sal_uLong nNow);
DECL_LINK( TimerHdl, Timer*, void );
- DECL_LINK( InitHdl, Idle*, void );
+ DECL_LINK( InitHdl, Timer*, void );
public:
ScAutoStyleList(ScDocShell* pShell);
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index bed2f73a2707..81edfe2a1a71 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -151,7 +151,7 @@ private:
DECL_LINK( SelectHandle, SvTreeListBox*, void );
DECL_LINK( DeselectHandle, SvTreeListBox*, void );
- DECL_LINK( UpdateSelectionHdl, Idle*, void );
+ DECL_LINK( UpdateSelectionHdl, Timer*, void );
DECL_LINK( KeepMineHandle, Button*, void );
DECL_LINK( KeepOtherHandle, Button*, void );
DECL_LINK( KeepAllMineHandle, Button*, void );
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index f2e2dfa735c6..558f5eae00d0 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -220,7 +220,7 @@ private:
DECL_LINK( EndDlgHdl, Button*, void );
// Hack: RefInput control
- DECL_LINK( TimeOutHdl, Idle*, void );
+ DECL_LINK( TimeOutHdl, Timer*, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index a7991fa77358..68fdba9be8fb 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -214,7 +214,7 @@ private:
ScNavigatorControllerItem** ppBoundItems;
- DECL_LINK(TimeHdl, Idle*, void);
+ DECL_LINK(TimeHdl, Timer*, void);
DECL_LINK(DocumentSelectHdl, ListBox&, void);
DECL_LINK(ToolBoxSelectHdl, ToolBox*, void);
DECL_LINK(ToolBoxDropdownClickHdl, ToolBox*, void);
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index dba4b2e3071d..e63b00d8161c 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -108,7 +108,7 @@ private:
sal_uInt16 nSelected;
OString aSelectedIdent;
- DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void );
+ DECL_DLLPRIVATE_LINK( TimerHdl, Timer*, void );
protected:
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 6bfa541b1288..fe63085338f9 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -109,13 +109,13 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window
nAcceptCount=0;
nRejectCount=0;
aReOpenIdle.SetPriority(TaskPriority::MEDIUM);
- aReOpenIdle.SetIdleHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl ));
+ aReOpenIdle.SetInvokeHandler(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl ));
pTPFilter=m_pAcceptChgCtr->GetFilterPage();
pTPView=m_pAcceptChgCtr->GetViewPage();
pTheView=pTPView->GetTableControl();
aSelectionIdle.SetPriority(TaskPriority::LOW);
- aSelectionIdle.SetIdleHdl(LINK( this, ScAcceptChgDlg, UpdateSelectionHdl ));
+ aSelectionIdle.SetInvokeHandler(LINK( this, ScAcceptChgDlg, UpdateSelectionHdl ));
aSelectionIdle.SetDebugName( "ScAcceptChgDlg aSelectionIdle" );
pTPFilter->SetReadyHdl(LINK( this, ScAcceptChgDlg, FilterHandle ));
@@ -1610,14 +1610,14 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void)
aMsgQueue.clear();
}
-IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Timer *, void)
{
ScSimpleRefDlgWrapper::SetAutoReOpen(true);
m_pAcceptChgCtr->ShowFilterPage();
RefHandle(nullptr);
}
-IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void)
+IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Timer *, void)
{
ScTabView* pTabView = pViewData->GetView();
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 5998d3991eb5..54425e0fee65 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -765,7 +765,7 @@ ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef
{
m_aHelper.SetWindow(m_rWindow.get());
aIdle.SetPriority(TaskPriority::LOWER);
- aIdle.SetIdleHdl(LINK( this, ScRefHandler, UpdateFocusHdl));
+ aIdle.SetInvokeHandler(LINK( this, ScRefHandler, UpdateFocusHdl));
if( bBindRef ) EnterRefMode();
}
@@ -937,7 +937,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
m_aHelper.ToggleCollapsed( pEdit, pButton );
}
-IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Idle *, void)
+IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Timer *, void)
{
if (pActiveWin)
{
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 6b5068742251..3a22b6dc787c 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -422,7 +422,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
m_pLbConflicts->SetHighlightRange();
maSelectionIdle.SetPriority( TaskPriority::LOW );
- maSelectionIdle.SetIdleHdl( LINK( this, ScConflictsDlg, UpdateSelectionHdl ) );
+ maSelectionIdle.SetInvokeHandler( LINK( this, ScConflictsDlg, UpdateSelectionHdl ) );
maSelectionIdle.SetDebugName( "ScConflictsDlg maSelectionIdle" );
m_pLbConflicts->SetSelectHdl( LINK( this, ScConflictsDlg, SelectHandle ) );
@@ -564,7 +564,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void)
mbInDeselectHdl = false;
}
-IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Idle *, void)
+IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Timer *, void)
{
if ( !mpViewData || !mpOwnDoc )
{
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 5d569b0ffbd8..69afe42fe9ec 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -131,7 +131,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
m_pBtnFromFile->Check();
SetFromTo_Impl();
- aBrowseTimer.SetTimeoutHdl( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) );
+ aBrowseTimer.SetInvokeHandler( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) );
aBrowseTimer.SetTimeout( 200 );
}
}
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6e3be2ef8b26..efcd4070f109 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -527,7 +527,7 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, bool bSidebar, vcl::Window* pPar
aContentBox->Hide();
aScenarioBox->Hide();
- aContentIdle.SetIdleHdl( LINK( this, ScNavigatorDlg, TimeHdl ) );
+ aContentIdle.SetInvokeHandler( LINK( this, ScNavigatorDlg, TimeHdl ) );
aContentIdle.SetPriority( TaskPriority::LOWEST );
if (bInSidebar)
@@ -649,7 +649,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-IMPL_LINK( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void )
+IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pIdle, void )
{
if ( pIdle != &aContentIdle )
return;
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 960232381d01..3585996edfba 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -367,7 +367,7 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt )
{
if(!aIdle.IsActive())
{
- aIdle.SetIdleHdl(LINK( this, ScExtIButton, TimerHdl));
+ aIdle.SetInvokeHandler(LINK( this, ScExtIButton, TimerHdl));
aIdle.Start();
}
@@ -377,14 +377,14 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt )
void ScExtIButton::MouseButtonUp( const MouseEvent& rMEvt)
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link<Idle *, void>());
+ aIdle.ClearInvokeHandler();
ImageButton::MouseButtonUp(rMEvt );
}
void ScExtIButton::Click()
{
aIdle.Stop();
- aIdle.SetIdleHdl(Link<Idle *, void>());
+ aIdle.ClearInvokeHandler();
ImageButton::Click();
}
@@ -423,7 +423,7 @@ bool ScExtIButton::PreNotify( NotifyEvent& rNEvt )
return ImageButton::PreNotify(rNEvt );
}
-IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Idle *, void)
+IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Timer *, void)
{
StartPopup();
}
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 9d5282e58a77..eb16c4972b41 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -59,7 +59,7 @@ ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window*
Rectangle aVisPixel( Point( 0, 0 ), aSizePixel );
aVisRect = pWindow->PixelToLogic( aVisPixel, aMapMode );
- aTimer.SetTimeoutHdl( LINK( this, ScNoteMarker, TimeHdl ) );
+ aTimer.SetInvokeHandler( LINK( this, ScNoteMarker, TimeHdl ) );
aTimer.SetTimeout( bForce ? SC_NOTEMARK_SHORT : SC_NOTEMARK_TIME );
aTimer.Start();
}
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fe837a7794d8..a17a1451c078 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -72,7 +72,7 @@ void ScTabView::Init()
mbInlineWithScrollbar = officecfg::Office::Calc::Layout::Other::TabbarInlineWithScrollbar::get();
aScrollTimer.SetTimeout(10);
- aScrollTimer.SetTimeoutHdl( LINK( this, ScTabView, TimerHdl ) );
+ aScrollTimer.SetInvokeHandler( LINK( this, ScTabView, TimerHdl ) );
for (i=0; i<4; i++)
pGridWin[i] = nullptr;
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index dbe30db24e91..53ab4d81f946 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -29,7 +29,7 @@ ScAddInResult::ScAddInResult(const String& rStr) :
nTickCount( 0 )
{
aTimer.SetTimeout( 1000 );
- aTimer.SetTimeoutHdl( LINK( this, ScAddInResult, TimeoutHdl ) );
+ aTimer.SetInvokeHandler( LINK( this, ScAddInResult, TimeoutHdl ) );
aTimer.Start();
}
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 23a42accc349..47af1b7c726f 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -185,7 +185,7 @@ private:
SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj);
DECL_DLLPRIVATE_LINK(WorkStartupHdl, Timer *, void);
- DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, Idle *, void);
+ DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, Timer *, void);
DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus&, void);
std::vector< OUString > maAnnotationAuthors;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 967930afa1e7..9438660e5725 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -3024,7 +3024,7 @@ void MainSequence::init()
{
mnSequenceType = EffectNodeType::MAIN_SEQUENCE;
- maTimer.SetTimeoutHdl( LINK(this, MainSequence, onTimerHdl) );
+ maTimer.SetInvokeHandler( LINK(this, MainSequence, onTimerHdl) );
maTimer.SetTimeout(500);
mxChangesListener.set( new AnimationChangeListener( this ) );
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 190f5c0914c9..8bdf71fde7c9 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -686,7 +686,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
pPage->SetAutoLayout( AUTOLAYOUT_TITLE, true, true );
mpWorkStartupTimer = new Timer("DrawWorkStartupTimer");
- mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) );
+ mpWorkStartupTimer->SetInvokeHandler( LINK(this, SdDrawDocument, WorkStartupHdl) );
mpWorkStartupTimer->SetTimeout(2000);
mpWorkStartupTimer->Start();
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 0f5fe0e50d19..306f3394e4f2 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -770,7 +770,7 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
mpOnlineSpellingList->seekShape(0);
mpOnlineSpellingIdle = new Idle("OnlineSpelling");
- mpOnlineSpellingIdle->SetIdleHdl( LINK(this, SdDrawDocument, OnlineSpellingHdl) );
+ mpOnlineSpellingIdle->SetInvokeHandler( LINK(this, SdDrawDocument, OnlineSpellingHdl) );
mpOnlineSpellingIdle->SetPriority(TaskPriority::LOWEST);
mpOnlineSpellingIdle->Start();
}
@@ -819,7 +819,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
}
// OnlineSpelling in the background
-IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl, Idle *, void)
+IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl, Timer *, void)
{
if (mpOnlineSpellingList!=nullptr
&& ( !mbOnlineSpell || mpOnlineSpellingList->hasMore()))
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 319d9b45e6d2..5d2697a1952f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -233,7 +233,7 @@ void CustomAnimationPane::initialize()
// Wait a short time before the presets list is created. This gives the
// system time to paint the control.
maLateInitTimer.SetTimeout(100);
- maLateInitTimer.SetTimeoutHdl(LINK(this, CustomAnimationPane, lateInitCallback));
+ maLateInitTimer.SetInvokeHandler(LINK(this, CustomAnimationPane, lateInitCallback));
maLateInitTimer.Start();
UpdateLook();
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 05a173449875..b62fa85b84f7 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -496,7 +496,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
addListener();
maLateInitTimer.SetTimeout(200);
- maLateInitTimer.SetTimeoutHdl(LINK(this, SlideTransitionPane, LateInitCallback));
+ maLateInitTimer.SetInvokeHandler(LINK(this, SlideTransitionPane, LateInitCallback));
maLateInitTimer.Start();
UpdateLook();
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index cdb2448d1e39..6f8fee9961bf 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -48,7 +48,7 @@ BreakDlg::BreakDlg(
, mpProgress( nullptr )
{
m_aUpdateIdle.SetPriority( TaskPriority::REPAINT );
- m_aUpdateIdle.SetIdleHdl( LINK( this, BreakDlg, InitialUpdate ) );
+ m_aUpdateIdle.SetInvokeHandler( LINK( this, BreakDlg, InitialUpdate ) );
m_aUpdateIdle.SetDebugName( "sd::BreakDlg m_aUpdateIdle" );
get(m_pFiObjInfo, "metafiles");
@@ -171,7 +171,7 @@ short BreakDlg::Execute()
/**
* link-method which starts the working function
*/
-IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Idle *, void)
+IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Timer *, void)
{
pDrView->DoImportMarkedMtf(pProgrInfo);
EndDialog(RET_OK);
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index bcf391323026..27a8c12af781 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -59,7 +59,7 @@ private:
void CheckSelectionState();
DECL_LINK( PlayMusicHdl, void *, void );
- DECL_LINK( IsMusicStoppedHdl, Idle *, void );
+ DECL_LINK( IsMusicStoppedHdl, Timer *, void );
public:
explicit SdFileDialog_Imp();
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
}
}
-IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
+IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)
{
SolarMutexGuard aGuard;
@@ -213,7 +213,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
mbUsableSelection( false ),
mbLabelPlaying(false)
{
- maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
+ maUpdateIdle.SetInvokeHandler(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
maUpdateIdle.SetDebugName( "SdFileDialog_Imp maUpdateIdle" );
css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker();
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 5c12a3cef62b..4535061fb7f7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -77,7 +77,7 @@ ConfigurationUpdater::ConfigurationUpdater (
// and the requested configuration differ. With the timer we try
// updates until the two configurations are the same.
maUpdateTimer.SetTimeout(snNormalTimeout);
- maUpdateTimer.SetTimeoutHdl(LINK(this,ConfigurationUpdater,TimeoutHandler));
+ maUpdateTimer.SetInvokeHandler(LINK(this,ConfigurationUpdater,TimeoutHandler));
mxControllerManager = rxControllerManager;
}
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 7022b91dde2c..e41c7c10f396 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -71,7 +71,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController)
Any());
// Prepare the printer polling.
- maPrinterPollingIdle.SetIdleHdl(LINK(this,ShellStackGuard,TimeoutHandler));
+ maPrinterPollingIdle.SetInvokeHandler(LINK(this,ShellStackGuard,TimeoutHandler));
maPrinterPollingIdle.SetPriority(TaskPriority::LOWER);
}
}
@@ -118,7 +118,7 @@ void SAL_CALL ShellStackGuard::disposing (
}
}
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pIdle, void)
{
#ifdef DEBUG
OSL_ASSERT(pIdle==&maPrinterPollingIdle);
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index c2281253286d..2cdba472f5e2 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -83,7 +83,7 @@ private:
std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
Idle maPrinterPollingIdle;
- DECL_LINK(TimeoutHandler, Idle*, void);
+ DECL_LINK(TimeoutHandler, Timer*, 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/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 7ef6ab46b3b4..4e11571eac0b 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -84,13 +84,13 @@ FuPoor::FuPoor (
{
ReceiveRequest(rReq);
- aScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, ScrollHdl) );
+ aScrollTimer.SetInvokeHandler( LINK(this, FuPoor, ScrollHdl) );
aScrollTimer.SetTimeout(SELENG_AUTOREPEAT_INTERVAL);
- aDragTimer.SetTimeoutHdl( LINK(this, FuPoor, DragHdl) );
+ aDragTimer.SetInvokeHandler( LINK(this, FuPoor, DragHdl) );
aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT);
- aDelayToScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, DelayHdl) );
+ aDelayToScrollTimer.SetInvokeHandler( LINK(this, FuPoor, DelayHdl) );
aDelayToScrollTimer.SetTimeout(2000);
}
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 1f37322bc3f0..55faf6cb2d32 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -72,7 +72,7 @@ private:
DECL_LINK( CancelButtonHdl, Button*, void );
DECL_LINK( UpDate, void*, bool );
- DECL_LINK( InitialUpdate, Idle*, void );
+ DECL_LINK( InitialUpdate, Timer*, void );
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 512c4fba2207..e19b7b3a302e 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -250,8 +250,8 @@ protected:
sal_uInt16 mnLockRedrawSmph;
bool mbIsDropAllowed;
- DECL_LINK( DropErrorHdl, Idle*, void );
- DECL_LINK( DropInsertFileHdl, Idle*, void );
+ DECL_LINK( DropErrorHdl, Timer*, void );
+ DECL_LINK( DropInsertFileHdl, Timer*, void );
DECL_LINK( ExecuteNavigatorDrop, void*, void );
void ImplClearDrawDropMarker();
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 7fdafe6aa5ab..3fe735570268 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -109,8 +109,8 @@ void MasterPageContainerQueue::LateInit()
{
// Set up the timer for the delayed creation of preview bitmaps.
maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout);
- Link<Timer *, void> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
- maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink);
+ maDelayedPreviewCreationTimer.SetInvokeHandler(
+ LINK(this,MasterPageContainerQueue,DelayedPreviewCreation) );
}
bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& rpDescriptor)
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index d4e2d4ccb1c4..2ca0044f301f 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -65,9 +65,9 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc
// set HelpId
SetHelpId( HID_SD_WIN_PRESENTATION );
- maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) );
+ maPauseTimer.SetInvokeHandler( LINK( this, ShowWindow, PauseTimeoutHdl ) );
maPauseTimer.SetTimeout( 1000 );
- maMouseTimer.SetTimeoutHdl( LINK( this, ShowWindow, MouseTimeoutHdl ) );
+ maMouseTimer.SetInvokeHandler( LINK( this, ShowWindow, MouseTimeoutHdl ) );
maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e24f0a918f27..f34d6972e312 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -510,14 +510,14 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
if( mpViewShell )
mpOldActiveWindow = mpViewShell->GetActiveWindow();
- maUpdateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, updateHdl));
+ maUpdateTimer.SetInvokeHandler(LINK(this, SlideshowImpl, updateHdl));
// Priority must not be too high or we'll starve input handling etc.
maUpdateTimer.SetPriority(TaskPriority::REPAINT);
- maDeactivateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, deactivateHdl));
+ maDeactivateTimer.SetInvokeHandler(LINK(this, SlideshowImpl, deactivateHdl));
maDeactivateTimer.SetTimeout( 20 );
- maInputFreezeTimer.SetTimeoutHdl( LINK( this, SlideshowImpl, ReadyForNextInputHdl ) );
+ maInputFreezeTimer.SetInvokeHandler( LINK( this, SlideshowImpl, ReadyForNextInputHdl ) );
maInputFreezeTimer.SetTimeout( 20 );
SvtSaveOptions aOptions;
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 6e318c077a74..b9d3add376ae 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -124,7 +124,7 @@ CacheCompactor::CacheCompactor(
mbIsCompactionRunning(false)
{
maCompactionTimer.SetTimeout(100);
- maCompactionTimer.SetTimeoutHdl(LINK(this,CacheCompactor,CompactionCallback));
+ maCompactionTimer.SetInvokeHandler(LINK(this,CacheCompactor,CompactionCallback));
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 31a8a52b64d5..7d030d2a8e6d 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -58,7 +58,7 @@ std::shared_ptr<CacheConfiguration> CacheConfiguration::Instance()
rInstancePtr.reset(new CacheConfiguration());
mpWeakInstance = rInstancePtr;
// Prepare to release this instance in the near future.
- maReleaseTimer.SetTimeoutHdl(
+ maReleaseTimer.SetInvokeHandler(
LINK(rInstancePtr.get(),CacheConfiguration,TimerCallback));
maReleaseTimer.SetTimeout(5000 /* 5s */);
maReleaseTimer.Start();
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 67ab7e2f82f9..a4ba8dd088ee 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -58,7 +58,7 @@ QueueProcessor::QueueProcessor (
if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle;
- maTimer.SetTimeoutHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
+ maTimer.SetInvokeHandler (LINK(this,QueueProcessor,ProcessRequestHdl));
maTimer.SetTimeout (10);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index d1791ad795ee..35c578f0aa3d 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -68,7 +68,7 @@ Animator::Animator (SlideSorter& rSlideSorter)
mnNextAnimationId(0)
{
maIdle.SetPriority(TaskPriority::REPAINT);
- maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler));
+ maIdle.SetInvokeHandler(LINK(this,Animator,TimeoutHandler));
}
Animator::~Animator()
@@ -211,7 +211,7 @@ void Animator::RequestNextFrame ()
}
}
-IMPL_LINK_NOARG(Animator, TimeoutHandler, Idle *, void)
+IMPL_LINK_NOARG(Animator, TimeoutHandler, Timer *, void)
{
if (mbIsDisposed)
return;
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 6c026415b04f..40a8616adcd2 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -46,7 +46,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter)
maSwitchPageDelayTimer()
{
maSwitchPageDelayTimer.SetTimeout(100);
- maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback));
+ maSwitchPageDelayTimer.SetInvokeHandler(LINK(this,CurrentSlideManager,SwitchPageCallback));
}
CurrentSlideManager::~CurrentSlideManager()
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index f38ed105997c..e06b6359e11c 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -60,7 +60,7 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter)
mpScrollBarFiller->Hide();
maAutoScrollTimer.SetTimeout(25);
- maAutoScrollTimer.SetTimeoutHdl (
+ maAutoScrollTimer.SetInvokeHandler (
LINK(this, ScrollBarManager, AutoScrollTimeoutHandler));
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index ff127eace895..855994d7234c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -100,7 +100,7 @@ private:
AnimationId mnNextAnimationId;
- DECL_LINK(TimeoutHandler, Idle *, void);
+ DECL_LINK(TimeoutHandler, Timer *, void);
/** Execute one step of every active animation.
@param nTime
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 4077e83068df..9dc22257667b 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -40,7 +40,7 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter)
sd::Window *window = rSlideSorter.GetContentWindow().get();
const HelpSettings& rHelpSettings = window->GetSettings().GetHelpSettings();
maShowTimer.SetTimeout(rHelpSettings.GetTipDelay());
- maShowTimer.SetTimeoutHdl(LINK(this, ToolTip, DelayTrigger));
+ maShowTimer.SetInvokeHandler(LINK(this, ToolTip, DelayTrigger));
maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay());
}
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 7208db4f2129..633ebadf8720 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -27,8 +27,7 @@ AsynchronousCall::AsynchronousCall()
: maTimer(),
mpFunction()
{
- Link<Timer *, void> aCallback (LINK(this,AsynchronousCall,TimerCallback));
- maTimer.SetTimeoutHdl(aCallback);
+ maTimer.SetInvokeHandler( LINK(this,AsynchronousCall,TimerCallback) );
}
AsynchronousCall::~AsynchronousCall()
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index f61823b31d6a..e2a8385d0dd0 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -89,8 +89,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution (
mpSelf(),
mnMaxTimePerStep(nMaxTimePerStep)
{
- Link<Timer *, void> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
- maTimer.SetTimeoutHdl(aLink);
+ maTimer.SetInvokeHandler( LINK(this,TimerBasedTaskExecution,TimerCallback) );
maTimer.SetTimeout(nMillisecondsBetweenSteps);
maTimer.Start();
}
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 87f03b9b65f4..ac8e4a0a3133 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -343,7 +343,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
{
// Start a timer that will unlock the ToolBarManager update lock when
// that is not done explicitly by calling Release().
- maTimer.SetTimeoutHdl(LINK(this,ToolBarManagerLock,TimeoutCallback));
+ maTimer.SetInvokeHandler(LINK(this,ToolBarManagerLock,TimeoutCallback));
maTimer.SetTimeout(100);
maTimer.Start();
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 66b0ef5abc32..2ff577af78a6 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -142,9 +142,9 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
SetMeasureLayer(SD_RESSTR(STR_LAYER_MEASURELINES));
// Timer for delayed drop (has to be for MAC)
- maDropErrorIdle.SetIdleHdl( LINK(this, View, DropErrorHdl) );
+ maDropErrorIdle.SetInvokeHandler( LINK(this, View, DropErrorHdl) );
maDropErrorIdle.SetPriority(TaskPriority::MEDIUM);
- maDropInsertFileIdle.SetIdleHdl( LINK(this, View, DropInsertFileHdl) );
+ maDropInsertFileIdle.SetInvokeHandler( LINK(this, View, DropInsertFileHdl) );
maDropInsertFileIdle.SetPriority(TaskPriority::MEDIUM);
}
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 5fffe0460c1a..060760ce4948 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -385,7 +385,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
/**
* Timer handler for InsertFile at Drop()
*/
-IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
{
DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" );
if( !mpViewSh )
@@ -576,7 +576,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void)
/**
* Timer handler for Errorhandling at Drop()
*/
-IMPL_LINK_NOARG(View, DropErrorHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropErrorHdl, Timer *, void)
{
ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 4e9a40e1ade6..1c88d46eba5d 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -88,7 +88,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
explicit SfxEventAsyncer_Impl(const SfxEventHint& rHint);
- DECL_LINK( IdleHdl, Idle*, void );
+ DECL_LINK( IdleHdl, Timer*, void );
};
@@ -108,14 +108,14 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint )
if( rHint.GetObjShell() )
StartListening( *rHint.GetObjShell() );
pIdle.reset( new Idle("SfxEventASyncer") );
- pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, IdleHdl) );
+ pIdle->SetInvokeHandler( LINK(this, SfxEventAsyncer_Impl, IdleHdl) );
pIdle->SetPriority( TaskPriority::HIGHEST );
pIdle->SetDebugName( "sfx::SfxEventAsyncer_Impl pIdle" );
pIdle->Start();
}
-IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void)
+IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Timer*, pAsyncIdle, void)
{
SfxObjectShellRef xRef( aHint.GetObjShell() );
pAsyncIdle->Stop();
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 12333ecc801a..1ac1ce28c709 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -550,10 +550,9 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
get(m_pOpenBtn, "display");
m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) );
- Link<Timer *, void> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl );
- aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl ));
+ aFactoryIdle.SetInvokeHandler( LINK(this, IndexTabPage_Impl, IdleHdl ));
aFactoryIdle.SetPriority(TaskPriority::LOWER);
- aKeywordTimer.SetTimeoutHdl( aTimeoutLink );
+ aKeywordTimer.SetInvokeHandler( LINK( this, IndexTabPage_Impl, TimeoutHdl ) );
}
IndexTabPage_Impl::~IndexTabPage_Impl()
@@ -724,7 +723,7 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl, Button*, void)
m_pIndexCB->GetDoubleClickHdl().Call(*m_pIndexCB);
}
-IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void )
+IMPL_LINK( IndexTabPage_Impl, IdleHdl, Timer*, pIdle, void )
{
if ( &aFactoryIdle == pIdle )
InitializeIndex();
@@ -1431,7 +1430,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent)
m_pActiveLB->SetSelectHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectHdl ) );
nMinWidth = ( m_pActiveLB->GetSizePixel().Width() / 2 );
- aIdle.SetIdleHdl( LINK( this, SfxHelpIndexWindow_Impl, InitHdl ) );
+ aIdle.SetInvokeHandler( LINK( this, SfxHelpIndexWindow_Impl, InitHdl ) );
aIdle.SetPriority( TaskPriority::LOWER );
aIdle.Start();
@@ -1555,17 +1554,17 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl, ListBox&, void)
aIdle.Start();
}
-IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl, Timer *, void)
{
bIsInitDone = true;
Initialize();
// now use the timer for selection
- aIdle.SetIdleHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectFactoryHdl ) );
+ aIdle.SetInvokeHandler( LINK( this, SfxHelpIndexWindow_Impl, SelectFactoryHdl ) );
aIdle.SetPriority( TaskPriority::LOWEST );
}
-IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, void)
{
OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectEntryData());
if ( pFactory )
@@ -1901,7 +1900,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
InitOnStartupBox();
aOnStartupCB->SetClickHdl( LINK( this, SfxHelpTextWindow_Impl, CheckHdl ) );
- aSelectIdle.SetIdleHdl( LINK( this, SfxHelpTextWindow_Impl, SelectHdl ) );
+ aSelectIdle.SetInvokeHandler( LINK( this, SfxHelpTextWindow_Impl, SelectHdl ) );
aSelectIdle.SetPriority( TaskPriority::LOWEST );
char* pEnv = getenv( "help_debug" );
@@ -2150,7 +2149,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode )
}
-IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl, Timer *, void)
{
try
{
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 215ce2aeab0f..e3c1bcb92104 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -139,7 +139,7 @@ private:
void ClearIndex();
DECL_LINK(OpenHdl, Button*, void);
- DECL_LINK(IdleHdl, Idle*, void);
+ DECL_LINK(IdleHdl, Timer*, void);
DECL_LINK(TimeoutHdl, Timer*, void);
public:
@@ -315,8 +315,8 @@ private:
DECL_LINK(ActivatePageHdl, TabControl*, void );
DECL_LINK(SelectHdl, ListBox&, void);
- DECL_LINK(InitHdl, Idle *, void);
- DECL_LINK(SelectFactoryHdl, Idle *, void);
+ DECL_LINK(InitHdl, Timer *, void);
+ DECL_LINK(SelectFactoryHdl, Timer *, void);
DECL_LINK(KeywordHdl, IndexTabPage_Impl&, void);
DECL_LINK(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool);
DECL_LINK(TabPageDoubleClickHdl, ListBox&, void);
@@ -454,7 +454,7 @@ private:
getCursor() const;
bool isHandledKey( const vcl::KeyCode& _rKeyCode );
- DECL_LINK( SelectHdl, Idle *, void);
+ DECL_LINK( SelectHdl, Timer *, void);
DECL_LINK( NotifyHdl, LinkParamNone*, void );
DECL_LINK( FindHdl, sfx2::SearchDialog&, void );
DECL_LINK( CloseHdl, sfx2::SearchDialog*, void );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index f1e5e334ab19..f9a91c8ab582 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -179,7 +179,7 @@ SfxBindings::SfxBindings()
// all caches are valid (no pending invalidate-job)
// create the list of caches
pImpl->pCaches = new SfxStateCacheArr_Impl;
- pImpl->aAutoTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob) );
+ pImpl->aAutoTimer.SetInvokeHandler( LINK(this, SfxBindings, NextJob) );
pImpl->aAutoTimer.SetDebugName( "sfx::SfxBindings aAutoTimer" );
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 91625cc825a1..75918efcbc23 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -451,7 +451,7 @@ void SfxDispatcher::Construct_Impl()
xImp->xPoster = new SfxHintPoster(aGenLink);
xImp->aIdle.SetPriority(TaskPriority::MEDIUM);
- xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ xImp->aIdle.SetInvokeHandler( LINK(this, SfxDispatcher, EventHdl_Impl ) );
xImp->aIdle.SetDebugName( "sfx::SfxDispatcher_Impl aIdle" );
}
@@ -575,7 +575,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode)
{
// No immediate update is requested
xImp->aIdle.SetPriority(TaskPriority::MEDIUM);
- xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ xImp->aIdle.SetInvokeHandler( LINK(this, SfxDispatcher, EventHdl_Impl ) );
xImp->aIdle.Start();
}
else
@@ -600,7 +600,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode)
It flushes the Stack, if it is dirty, thus it actually executes the
pending Push and Pop commands.
*/
-IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Idle *, void )
+IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Timer *, void )
{
Flush();
Update_Impl();
@@ -771,7 +771,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
{
// No immediate update is requested
xImp->aIdle.SetPriority(TaskPriority::MEDIUM);
- xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+ xImp->aIdle.SetInvokeHandler( LINK(this, SfxDispatcher, EventHdl_Impl ) );
xImp->aIdle.Start();
}
}
diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx
index 706f0cceeca6..ab29780eaa49 100644
--- a/sfx2/source/control/itemdel.cxx
+++ b/sfx2/source/control/itemdel.cxx
@@ -30,7 +30,7 @@ class SfxItemDisruptor_Impl
Idle m_Idle;
private:
- DECL_LINK( Delete, Idle*, void );
+ DECL_LINK( Delete, Timer*, void );
public:
explicit SfxItemDisruptor_Impl(SfxPoolItem *pItemToDesrupt);
@@ -44,7 +44,7 @@ SfxItemDisruptor_Impl::SfxItemDisruptor_Impl(SfxPoolItem *const pItemToDisrupt)
: pItem(pItemToDisrupt)
, m_Idle("sfx SfxItemDisruptor_Impl::Delete")
{
- m_Idle.SetIdleHdl(LINK(this, SfxItemDisruptor_Impl, Delete));
+ m_Idle.SetInvokeHandler(LINK(this, SfxItemDisruptor_Impl, Delete));
m_Idle.SetPriority(TaskPriority::DEFAULT_IDLE);
DBG_ASSERT( 0 == pItem->GetRefCount(), "disrupting pooled item" );
@@ -66,7 +66,7 @@ SfxItemDisruptor_Impl::~SfxItemDisruptor_Impl()
delete pItem;
}
-IMPL_LINK_NOARG(SfxItemDisruptor_Impl, Delete, Idle*, void)
+IMPL_LINK_NOARG(SfxItemDisruptor_Impl, Delete, Timer*, void)
{
delete this;
}
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index a09708508ad0..8d674ffb09de 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -270,7 +270,7 @@ void SfxModelessDialog::Move()
Implements a timer event that is triggered by a move or resize of the window
This will save config information to Views.xcu with a small delay
*/
-IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Timer *, void)
{
pImpl->aMoveIdle.Stop();
if ( pImpl->bConstructed && pImpl->pMgr )
@@ -302,7 +302,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(TaskPriority::RESIZE);
- pImpl->aMoveIdle.SetIdleHdl(LINK(this,SfxModelessDialog,TimerHdl));
+ pImpl->aMoveIdle.SetInvokeHandler(LINK(this,SfxModelessDialog,TimerHdl));
}
/* [Description]
@@ -440,7 +440,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(TaskPriority::RESIZE);
- pImpl->aMoveIdle.SetIdleHdl(LINK(this,SfxFloatingWindow,TimerHdl));
+ pImpl->aMoveIdle.SetInvokeHandler(LINK(this,SfxFloatingWindow,TimerHdl));
}
SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
@@ -457,7 +457,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(TaskPriority::RESIZE);
- pImpl->aMoveIdle.SetIdleHdl(LINK(this,SfxFloatingWindow,TimerHdl));
+ pImpl->aMoveIdle.SetInvokeHandler(LINK(this,SfxFloatingWindow,TimerHdl));
}
bool SfxFloatingWindow::Close()
@@ -525,7 +525,7 @@ void SfxFloatingWindow::Move()
Implements a timer event that is triggered by a move or resize of the window
This will save config information to Views.xcu with a small delay
*/
-IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Timer *, void)
{
pImpl->aMoveIdle.Stop();
if ( pImpl->bConstructed && pImpl->pMgr )
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e3917d9514ae..f799296ca8ec 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1507,9 +1507,9 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
m_aTimeField->SetPosSizePixel(aPos, aSize);
m_aEditLoseFocusIdle.SetPriority( TaskPriority::LOWEST );
- m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
+ m_aEditLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
m_aBoxLoseFocusIdle.SetPriority( TaskPriority::LOWEST );
- m_aBoxLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, BoxTimeoutHdl ) );
+ m_aBoxLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, BoxTimeoutHdl ) );
m_aNameBox->add_mnemonic_label(m_pHeaderAccName);
m_aNameBox->SetAccessibleName(m_pHeaderAccName->GetText());
@@ -1640,12 +1640,12 @@ IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, Control&, rControl, void )
m_aBoxLoseFocusIdle.Start();
}
-IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl, Idle *, void)
+IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl, Timer *, void)
{
ValidateLine( m_pCurrentLine, false );
}
-IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl, Idle *, void)
+IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl, Timer *, void)
{
ValidateLine( m_pCurrentLine, true );
}
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 6bc24a7865a8..ea70c9ca81cf 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -434,7 +434,7 @@ SfxDockingWindow_Impl::SfxDockingWindow_Impl(SfxDockingWindow* pBase)
,bDockingPrevented(false)
{
aMoveIdle.SetPriority(TaskPriority::RESIZE);
- aMoveIdle.SetIdleHdl(LINK(pBase,SfxDockingWindow,TimerHdl));
+ aMoveIdle.SetInvokeHandler(LINK(pBase,SfxDockingWindow,TimerHdl));
aMoveIdle.SetDebugName( "sfx::SfxDockingWindow_Impl aMoveIdle" );
}
@@ -1722,7 +1722,7 @@ void SfxDockingWindow::Move()
pImpl->aMoveIdle.Start();
}
-IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl, Timer *, void)
{
pImpl->aMoveIdle.Stop();
if ( IsReallyVisible() && IsFloatingMode() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 3f17a8af58ae..004be29324d4 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -657,7 +657,7 @@ void FileDialogHelper_Impl::updateVersions()
}
}
-IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void)
+IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl, Timer *, void)
{
if ( !mbHasPreview )
return;
@@ -987,7 +987,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
// aPreviewTimer
maPreviewIdle.SetPriority( TaskPriority::LOWEST );
- maPreviewIdle.SetIdleHdl( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
+ maPreviewIdle.SetInvokeHandler( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
break;
case FILEOPEN_PLAY:
@@ -1008,7 +1008,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mbHasPreview = true;
// aPreviewTimer
maPreviewIdle.SetPriority( TaskPriority::LOWEST );
- maPreviewIdle.SetIdleHdl( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
+ maPreviewIdle.SetInvokeHandler( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
break;
case FILESAVE_AUTOEXTENSION:
@@ -1022,7 +1022,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mbHasPreview = true;
// aPreviewTimer
maPreviewIdle.SetPriority( TaskPriority::LOWEST );
- maPreviewIdle.SetIdleHdl( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
+ maPreviewIdle.SetInvokeHandler( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
break;
default:
@@ -1137,7 +1137,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl()
if ( mbDeleteMatcher )
delete mpMatcher;
- maPreviewIdle.SetIdleHdl( Link<Idle *, void>() );
+ maPreviewIdle.ClearInvokeHandler();
::comphelper::disposeComponent( mxFileDlg );
}
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 2f500c071e9c..0becafecbd6f 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -144,7 +144,7 @@ namespace sfx2
std::vector<OUString>& rpURLList,
const std::shared_ptr<const SfxFilter>& pFilter );
- DECL_LINK( TimeOutHdl_Impl, Idle *, void);
+ DECL_LINK( TimeOutHdl_Impl, Timer *, void);
DECL_LINK( InitControls, void*, void );
public:
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index bd592dcb9f87..ed064ad780a6 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -105,7 +105,7 @@ public:
, bEndAutoHide( false )
, nState( 1 )
{
- aTimer.SetTimeoutHdl(
+ aTimer.SetInvokeHandler(
LINK(pOwner, SfxSplitWindow, TimerHdl ) );
aTimer.SetTimeout( 200 );
SetAlign( pOwner->GetAlign() );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8e56aeee142c..b654191a4937 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1379,7 +1379,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
EnableNew( bCanNew );
}
-IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void )
+IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, void )
{
if(!bDontUpdate)
{
@@ -1486,7 +1486,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
{
pIdle=new Idle("SfxCommonTemplate");
pIdle->SetPriority(TaskPriority::LOWEST);
- pIdle->SetIdleHdl(LINK(this,SfxCommonTemplateDialog_Impl,TimeOut));
+ pIdle->SetInvokeHandler(LINK(this,SfxCommonTemplateDialog_Impl,TimeOut));
}
pIdle->Start();
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 9b78b0cf857c..69c0f12ff0e7 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -145,7 +145,7 @@ class SfxNewFileDialog_Impl
SfxObjectShellLock xDocShell;
VclPtr<SfxNewFileDialog> pAntiImpl;
- DECL_LINK( Update, Idle *, void );
+ DECL_LINK( Update, Timer *, void );
DECL_LINK(RegionSelect, ListBox&, void);
DECL_LINK(TemplateSelect, ListBox&, void);
@@ -169,7 +169,7 @@ public:
void SetTemplateFlags(SfxTemplateFlags nSet);
};
-IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Idle*, void)
+IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Timer*, void)
{
if (xDocShell.Is())
{
@@ -409,7 +409,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
}
aPrevIdle.SetPriority( TaskPriority::LOWEST );
- aPrevIdle.SetIdleHdl( LINK( this, SfxNewFileDialog_Impl, Update));
+ aPrevIdle.SetInvokeHandler( LINK( this, SfxNewFileDialog_Impl, Update));
m_pRegionLb->SelectEntryPos(0);
RegionSelect(*m_pRegionLb);
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index ab9cb30eb94f..3af5440d0b3c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -213,7 +213,7 @@ protected:
DECL_LINK( ApplyHdl, LinkParamNone*, void );
DECL_LINK( TreeListApplyHdl, SvTreeListBox*, bool );
DECL_LINK( DropHdl, StyleTreeListBox_Impl&, bool );
- DECL_LINK( TimeOut, Idle*, void );
+ DECL_LINK( TimeOut, Timer*, void );
DECL_LINK( PreviewHdl, Button*, void);
virtual void EnableItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true)
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 5d29f6514ac5..f216e55c38c5 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -609,7 +609,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw
m_xImp->m_xClient = static_cast< embed::XEmbeddedClient* >( m_xImp.get() );
pViewShell->NewIPClient_Impl(this);
m_xImp->m_aTimer.SetTimeout( SFX_CLIENTACTIVATE_TIMEOUT );
- m_xImp->m_aTimer.SetTimeoutHdl( LINK( m_xImp.get(), SfxInPlaceClient_Impl, TimerHdl ) );
+ m_xImp->m_aTimer.SetInvokeHandler( LINK( m_xImp.get(), SfxInPlaceClient_Impl, TimerHdl ) );
}
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 7ad65102ee4b..acdfd62f8b4e 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -418,7 +418,7 @@ DemoWindow::DemoWindow() :
maRightBottomChild.SetPosSizePixel( Point(320,240), Size(320,240) );
Show();
- maUpdateTimer.SetTimeoutHdl(LINK(this, DemoWindow, updateHdl));
+ maUpdateTimer.SetInvokeHandler(LINK(this, DemoWindow, updateHdl));
maUpdateTimer.SetTimeout( (sal_uLong)30 );
maUpdateTimer.Start();
}
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 450c310ad8b3..dbb27a834688 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -59,8 +59,8 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
virtual void Command(const CommandEvent& rCEvt) override;
DECL_LINK(MenuSelectHdl, Menu *, bool);
- DECL_LINK(ModifyTimerHdl, Idle *, void);
- DECL_LINK(CursorMoveTimerHdl, Idle *, void);
+ DECL_LINK(ModifyTimerHdl, Timer *, void);
+ DECL_LINK(CursorMoveTimerHdl, Timer *, void);
virtual void DataChanged( const DataChangedEvent& ) override;
virtual void Resize() override;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index af3e3e90a4af..a60a7661f683 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -100,12 +100,12 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
// compare DataChanged
SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
- aModifyIdle.SetIdleHdl(LINK(this, SmEditWindow, ModifyTimerHdl));
+ aModifyIdle.SetInvokeHandler(LINK(this, SmEditWindow, ModifyTimerHdl));
aModifyIdle.SetPriority(TaskPriority::LOWEST);
if (!IsInlineEditEnabled())
{
- aCursorMoveIdle.SetIdleHdl(LINK(this, SmEditWindow, CursorMoveTimerHdl));
+ aCursorMoveIdle.SetInvokeHandler(LINK(this, SmEditWindow, CursorMoveTimerHdl));
aCursorMoveIdle.SetPriority(TaskPriority::LOWEST);
}
@@ -251,13 +251,13 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
Resize();
}
-IMPL_LINK_NOARG( SmEditWindow, ModifyTimerHdl, Idle *, void )
+IMPL_LINK_NOARG( SmEditWindow, ModifyTimerHdl, Timer *, void )
{
UpdateStatus(false);
aModifyIdle.Stop();
}
-IMPL_LINK_NOARG(SmEditWindow, CursorMoveTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SmEditWindow, CursorMoveTimerHdl, Timer *, void)
// every once in a while check cursor position (selection) of edit
// window and if it has changed (try to) set the formula-cursor
// according to that.
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 0da5ee3cd901..36c7dfd40b09 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -270,7 +270,7 @@ IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void)
void SmGraphicWindow::CaretBlinkInit()
{
- aCaretBlinkTimer.SetTimeoutHdl(LINK(this, SmGraphicWindow, CaretBlinkTimerHdl));
+ aCaretBlinkTimer.SetInvokeHandler(LINK(this, SmGraphicWindow, CaretBlinkTimerHdl));
aCaretBlinkTimer.SetTimeout( ScrollableWindow::GetSettings().GetStyleSettings().GetCursorBlinkTime() );
}
@@ -678,7 +678,7 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi
Hide();
- aInitialFocusTimer.SetTimeoutHdl(LINK(this, SmCmdBoxWindow, InitialFocusTimerHdl));
+ aInitialFocusTimer.SetInvokeHandler(LINK(this, SmCmdBoxWindow, InitialFocusTimerHdl));
aInitialFocusTimer.SetTimeout(100);
}
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 51f0c0e45d57..3ba541a524a6 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -203,7 +203,7 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent )
,m_nDragRowDividerLimit( 0 )
,m_nDragRowDividerOffset( 0 )
{
- aMouseTimer.SetTimeoutHdl( LINK( this, BrowserDataWin, RepeatedMouseMove ) );
+ aMouseTimer.SetInvokeHandler( LINK( this, BrowserDataWin, RepeatedMouseMove ) );
aMouseTimer.SetTimeout( 100 );
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index d8c00d9bc91a..104317b50141 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -522,7 +522,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,
mpHeaderBar->Show();
maResetQuickSearch.SetTimeout( QUICK_SEARCH_TIMEOUT );
- maResetQuickSearch.SetTimeoutHdl( LINK( this, ViewTabListBox_Impl, ResetQuickSearch_Impl ) );
+ maResetQuickSearch.SetInvokeHandler( LINK( this, ViewTabListBox_Impl, ResetQuickSearch_Impl ) );
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xInteractionHandler(
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index b6ee38a5a93a..6a108e369785 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -219,12 +219,12 @@ class SvxIconChoiceCtrl_Impl
DECL_LINK( ScrollUpDownHdl, ScrollBar*, void );
DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void );
- DECL_LINK( EditTimeoutHdl, Idle *, void);
+ DECL_LINK( EditTimeoutHdl, Timer *, void);
DECL_LINK( UserEventHdl, void*, void );
- DECL_LINK( AutoArrangeHdl, Idle*, void );
- DECL_LINK( DocRectChangedHdl, Idle*, void );
- DECL_LINK( VisRectChangedHdl, Idle*, void );
- DECL_LINK( CallSelectHdlHdl, Idle*, void );
+ DECL_LINK( AutoArrangeHdl, Timer*, void );
+ DECL_LINK( DocRectChangedHdl, Timer*, void );
+ DECL_LINK( VisRectChangedHdl, Timer*, void );
+ DECL_LINK( CallSelectHdlHdl, Timer*, void );
void AdjustScrollBars();
void PositionScrollBars( long nRealWidth, long nRealHeight );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 58cc3a6852e2..a08a2627cd1e 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -64,7 +64,7 @@ class IcnViewEdit_Impl : public MultiLineEdit
bool bGrabFocus;
void CallCallBackHdl_Impl();
- DECL_LINK(Timeout_Impl, Idle *, void);
+ DECL_LINK(Timeout_Impl, Timer *, void);
DECL_LINK( ReturnHdl_Impl, Accelerator&, void );
DECL_LINK( EscapeHdl_Impl, Accelerator&, void );
@@ -140,23 +140,23 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
nVerSBarWidth = aVerSBar->GetSizePixel().Width();
aEditIdle.SetPriority( TaskPriority::LOWEST );
- aEditIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
+ aEditIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
aEditIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aEditIdle" );
aAutoArrangeIdle.SetPriority( TaskPriority::LOW );
- aAutoArrangeIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,AutoArrangeHdl));
+ aAutoArrangeIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,AutoArrangeHdl));
aAutoArrangeIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aAutoArrangeIdle" );
aCallSelectHdlIdle.SetPriority( TaskPriority::LOWEST );
- aCallSelectHdlIdle.SetIdleHdl( LINK(this,SvxIconChoiceCtrl_Impl,CallSelectHdlHdl));
+ aCallSelectHdlIdle.SetInvokeHandler( LINK(this,SvxIconChoiceCtrl_Impl,CallSelectHdlHdl));
aCallSelectHdlIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aCallSelectHdlIdle" );
aDocRectChangedIdle.SetPriority( TaskPriority::MEDIUM );
- aDocRectChangedIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,DocRectChangedHdl));
+ aDocRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,DocRectChangedHdl));
aDocRectChangedIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aDocRectChangedIdle" );
aVisRectChangedIdle.SetPriority( TaskPriority::MEDIUM );
- aVisRectChangedIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
+ aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
aVisRectChangedIdle.SetDebugName( "svtools::SvxIconChoiceCtrl_Impl aVisRectChangedIdle" );
Clear( true );
@@ -2657,18 +2657,18 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList()
aSelectedRectList.clear();
}
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Timer *, void)
{
aAutoArrangeIdle.Stop();
Arrange( IsAutoArrange(), 0, 0 );
}
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Timer *, void)
{
aVisRectChangedIdle.Stop();
}
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Timer *, void)
{
aDocRectChangedIdle.Stop();
}
@@ -2681,7 +2681,7 @@ bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Po
return false;
}
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer *, void)
{
SvxIconChoiceCtrlEntry* pEntry = GetCurEntry();
if( bEntryEditingEnabled && pEntry &&
@@ -3033,7 +3033,7 @@ IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPo
bGrabFocus( false )
{
maLoseFocusIdle.SetPriority(TaskPriority::REPAINT);
- maLoseFocusIdle.SetIdleHdl(LINK(this,IcnViewEdit_Impl,Timeout_Impl));
+ maLoseFocusIdle.SetInvokeHandler(LINK(this,IcnViewEdit_Impl,Timeout_Impl));
maLoseFocusIdle.SetDebugName( "svx::IcnViewEdit_Impl maLoseFocusIdle" );
// FIXME: Outside of Paint Hierarchy
@@ -3086,7 +3086,7 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl()
}
}
-IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Idle *, void)
+IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Timer *, void)
{
CallCallBackHdl_Impl();
}
@@ -3504,7 +3504,7 @@ void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* )
aCallSelectHdlIdle.Start();
}
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Idle *, void)
+IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Timer *, void)
{
pHdlEntry = nullptr;
pView->ClickIcon();
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 9cbe0fa421a1..b25a5a068851 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -90,7 +90,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS
bAsyncBeginDrag = false;
aAsyncBeginDragIdle.SetPriority( TaskPriority::HIGHEST );
- aAsyncBeginDragIdle.SetIdleHdl( LINK(this,SvImpLBox,BeginDragHdl));
+ aAsyncBeginDragIdle.SetInvokeHandler( LINK(this,SvImpLBox,BeginDragHdl));
// button animation in listbox
pActiveButton = nullptr;
pActiveEntry = nullptr;
@@ -100,7 +100,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS
nCurTabPos = FIRST_ENTRY_TAB;
aEditIdle.SetPriority( TaskPriority::LOWEST );
- aEditIdle.SetIdleHdl( LINK(this,SvImpLBox,EditTimerCall) );
+ aEditIdle.SetInvokeHandler( LINK(this,SvImpLBox,EditTimerCall) );
nMostRight = -1;
pMostRightEntry = nullptr;
@@ -2888,7 +2888,7 @@ void SvImpLBox::BeginDrag()
}
}
-IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Idle *, void)
+IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Timer *, void)
{
pView->StartDrag( 0, aAsyncBeginDragPos );
}
@@ -3085,7 +3085,7 @@ void SvImpLBox::SetCurEntry( SvTreeListEntry* pEntry )
pView->Select( pEntry );
}
-IMPL_LINK_NOARG(SvImpLBox, EditTimerCall, Idle *, void)
+IMPL_LINK_NOARG(SvImpLBox, EditTimerCall, Timer *, void)
{
if( pView->IsInplaceEditingEnabled() )
{
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 649a7fb8cfa2..bd87930beb8d 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -200,13 +200,13 @@ void SvInplaceEdit2::LoseFocus()
{
bCanceled = false;
aIdle.SetPriority(TaskPriority::REPAINT);
- aIdle.SetIdleHdl(LINK(this,SvInplaceEdit2,Timeout_Impl));
+ aIdle.SetInvokeHandler(LINK(this,SvInplaceEdit2,Timeout_Impl));
aIdle.SetDebugName( "svtools::SvInplaceEdit2 aIdle" );
aIdle.Start();
}
}
-IMPL_LINK_NOARG(SvInplaceEdit2, Timeout_Impl, Idle *, void)
+IMPL_LINK_NOARG(SvInplaceEdit2, Timeout_Impl, Timer *, void)
{
CallCallBackHdl_Impl();
}
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 20cd96d9f79d..e9995af5473b 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -60,7 +60,7 @@ AsynchronLink::~AsynchronLink()
delete _pMutex;
}
-IMPL_LINK_NOARG( AsynchronLink, HandleCall_Idle, Idle*, void )
+IMPL_LINK_NOARG( AsynchronLink, HandleCall_Idle, Timer*, void )
{
if( _pMutex ) _pMutex->acquire();
_nEventId = nullptr;
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 80b9b507bd55..a6d1fe0e8e5c 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -204,7 +204,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
for (sal_Int32 i = 0; i < 31; ++i)
maDayTexts[i] = OUString::number(i+1);
- maDragScrollTimer.SetTimeoutHdl( LINK( this, Calendar, ScrollHdl ) );
+ maDragScrollTimer.SetInvokeHandler( LINK( this, Calendar, ScrollHdl ) );
maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() );
mnDragScrollHitTest = 0;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index c88fdf0958e2..7ff5d2b0d3ba 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -381,7 +381,7 @@ private:
bool mbPostEvt;
DECL_LINK( ImplEndEditHdl, void*, void );
- DECL_LINK( ImplEndTimerHdl, Idle*, void );
+ DECL_LINK( ImplEndTimerHdl, Timer*, void );
public:
TabBarEdit( TabBar* pParent, WinBits nWinStyle );
@@ -400,7 +400,7 @@ TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) :
{
mbPostEvt = false;
maLoseFocusIdle.SetPriority( TaskPriority::REPAINT );
- maLoseFocusIdle.SetIdleHdl( LINK( this, TabBarEdit, ImplEndTimerHdl ) );
+ maLoseFocusIdle.SetInvokeHandler( LINK( this, TabBarEdit, ImplEndTimerHdl ) );
maLoseFocusIdle.SetDebugName( "svtools::TabBarEdit maLoseFocusIdle" );
}
@@ -461,7 +461,7 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel, void )
GetParent()->EndEditMode( pCancel != nullptr );
}
-IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl, Timer *, void)
{
if ( HasFocus() )
return;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx