[Libreoffice-commits] core.git: avmedia/inc avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source forms/source formula/source fpicker/source framework/source include/formula include/sfx2 include/svtools include/svx include/vcl linguistic/source reportdesign/source sc/inc sc/source sc/workben sd/inc sd/source sfx2/source slideshow/test starmath/inc starmath/source svtools/source svx/inc svx/source sw/inc sw/qa sw/source vbahelper/source vcl/backendtest vcl/inc vcl/source vcl/unx vcl/workben
Jan-Marek Glogowski
glogow at fbihome.de
Mon Jan 23 19:52:35 UTC 2017
avmedia/inc/mediacontrol.hxx | 2
avmedia/source/framework/mediacontrol.cxx | 4 -
avmedia/source/framework/soundhandler.cxx | 4 -
avmedia/source/framework/soundhandler.hxx | 2
avmedia/source/opengl/oglplayer.cxx | 2
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 4 -
basctl/source/dlged/dlged.cxx | 4 -
basctl/source/dlged/dlgedfunc.cxx | 2
basctl/source/inc/dlged.hxx | 2
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx | 2
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/view/charttypes/GL3DBarChart.cxx | 4 -
chart2/source/view/inc/GL3DBarChart.hxx | 2
chart2/source/view/main/ChartView.cxx | 2
cui/source/customize/selector.cxx | 2
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 6 +-
cui/source/dialogs/cuigrfflt.cxx | 2
cui/source/dialogs/hldoctp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 2
cui/source/dialogs/linkdlg.cxx | 4 -
cui/source/dialogs/thesdlg.cxx | 4 -
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/chardlg.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/linkdlg.hxx | 2
cui/source/inc/macroass.hxx | 2
cui/source/inc/thesdlg.hxx | 2
cui/source/options/optjava.cxx | 4 -
cui/source/options/optjava.hxx | 2
cui/source/tabpages/backgrnd.cxx | 6 --
cui/source/tabpages/chardlg.cxx | 4 -
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/macroass.cxx | 4 -
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/control/sqledit.cxx | 4 -
dbaccess/source/ui/dlg/paramdialog.cxx | 2
dbaccess/source/ui/inc/JoinTableView.hxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 4 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
desktop/source/app/app.cxx | 4 -
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 8 +--
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 -
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit2.cxx | 6 +-
editeng/source/editeng/impedit3.cxx | 2
extensions/source/bibliography/bibcont.cxx | 4 -
extensions/source/bibliography/bibcont.hxx | 2
extensions/source/bibliography/toolbar.cxx | 4 -
extensions/source/bibliography/toolbar.hxx | 2
extensions/source/update/ui/updatecheckui.cxx | 8 +--
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/ListBox.cxx | 4 -
forms/source/component/ListBox.hxx | 2
formula/source/ui/dlg/formula.cxx | 10 +--
formula/source/ui/dlg/funcutl.cxx | 10 +--
fpicker/source/office/iodlg.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 2
framework/source/services/autorecovery.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 2
include/formula/formula.hxx | 2
include/formula/funcutl.hxx | 2
include/sfx2/basedlgs.hxx | 4 -
include/sfx2/dinfdlg.hxx | 4 -
include/sfx2/dispatch.hxx | 2
include/sfx2/dockwin.hxx | 2
include/svtools/asynclink.hxx | 3 -
include/svtools/filechangedchecker.hxx | 2
include/svtools/treelistbox.hxx | 2
include/svtools/wizdlg.hxx | 2
include/svx/fontwork.hxx | 2
include/svx/graphctl.hxx | 2
include/svx/imapdlg.hxx | 2
include/svx/modctrl.hxx | 2
include/svx/numvset.hxx | 2
include/svx/sidebar/PanelLayout.hxx | 2
include/svx/svdpntv.hxx | 2
include/vcl/dockwin.hxx | 2
include/vcl/idle.hxx | 13 -----
include/vcl/syswin.hxx | 2
include/vcl/texteng.hxx | 2
include/vcl/timer.hxx | 13 -----
include/vcl/toolbox.hxx | 2
include/vcl/window.hxx | 4 -
linguistic/source/lngsvcmgr.cxx | 4 -
linguistic/source/lngsvcmgr.hxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 2
reportdesign/source/ui/report/DesignView.cxx | 4 -
reportdesign/source/ui/report/dlgedfunc.cxx | 2
sc/inc/chartlis.hxx | 2
sc/inc/document.hxx | 2
sc/inc/scmod.hxx | 2
sc/source/core/data/documen2.cxx | 4 -
sc/source/core/tool/chartlis.cxx | 4 -
sc/source/core/tool/chartlock.cxx | 2
sc/source/core/tool/refreshtimer.cxx | 2
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/scmod.cxx | 6 +-
sc/source/ui/cctrl/checklistmenu.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/sfiltdlg.cxx | 4 -
sc/source/ui/docshell/autostyl.cxx | 6 +-
sc/source/ui/docshell/datastream.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/drawfunc/fupoor.cxx | 4 -
sc/source/ui/inc/acredlin.hxx | 4 -
sc/source/ui/inc/anyrefdg.hxx | 2
sc/source/ui/inc/autostyl.hxx | 2
sc/source/ui/inc/conflictsdlg.hxx | 2
sc/source/ui/inc/filtdlg.hxx | 2
sc/source/ui/inc/navipi.hxx | 2
sc/source/ui/inc/tphfedit.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 8 +--
sc/source/ui/miscdlgs/anyrefdg.cxx | 4 -
sc/source/ui/miscdlgs/conflictsdlg.cxx | 4 -
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/navipi/navipi.cxx | 4 -
sc/source/ui/pagedlg/tphfedit.cxx | 8 +--
sc/source/ui/view/notemark.cxx | 2
sc/source/ui/view/tabview5.cxx | 2
sc/workben/result.cxx | 2
sd/inc/drawdoc.hxx | 2
sd/source/core/CustomAnimationEffect.cxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/core/drawdoc4.cxx | 4 -
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 4 -
sd/source/ui/dlg/filedlg.cxx | 6 +-
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 2
sd/source/ui/framework/module/ShellStackGuard.cxx | 4 -
sd/source/ui/framework/module/ShellStackGuard.hxx | 2
sd/source/ui/func/fupoor.cxx | 6 +-
sd/source/ui/inc/BreakDlg.hxx | 2
sd/source/ui/inc/View.hxx | 4 -
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 4 -
sd/source/ui/slideshow/showwin.cxx | 4 -
sd/source/ui/slideshow/slideshowimpl.cxx | 6 +-
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 2
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 2
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 2
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 4 -
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 2
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 2
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 2
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2
sd/source/ui/tools/AsynchronousCall.cxx | 3 -
sd/source/ui/tools/TimerBasedTaskExecution.cxx | 3 -
sd/source/ui/view/ViewShellImplementation.cxx | 2
sd/source/ui/view/sdview.cxx | 4 -
sd/source/ui/view/sdview4.cxx | 4 -
sfx2/source/appl/appcfg.cxx | 6 +-
sfx2/source/appl/newhelp.cxx | 19 +++----
sfx2/source/appl/newhelp.hxx | 8 +--
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/dispatch.cxx | 8 +--
sfx2/source/control/itemdel.cxx | 6 +-
sfx2/source/dialog/basedlgs.cxx | 10 +--
sfx2/source/dialog/dinfdlg.cxx | 8 +--
sfx2/source/dialog/dockwin.cxx | 4 -
sfx2/source/dialog/filedlghelper.cxx | 10 +--
sfx2/source/dialog/filedlgimpl.hxx | 2
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/dialog/templdlg.cxx | 4 -
sfx2/source/doc/new.cxx | 6 +-
sfx2/source/inc/templdgi.hxx | 2
sfx2/source/view/ipclient.cxx | 2
slideshow/test/demoshow.cxx | 2
starmath/inc/edit.hxx | 4 -
starmath/source/edit.cxx | 8 +--
starmath/source/view.cxx | 4 -
svtools/source/brwbox/datwin.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/imivctl.hxx | 10 +--
svtools/source/contnr/imivctl1.cxx | 26 +++++-----
svtools/source/contnr/svimpbox.cxx | 8 +--
svtools/source/contnr/treelistbox.cxx | 4 -
svtools/source/control/asynclink.cxx | 2
svtools/source/control/calendar.cxx | 2
svtools/source/control/tabbar.cxx | 6 +-
svtools/source/control/valueset.cxx | 2
svtools/source/dialogs/prnsetup.cxx | 2
svtools/source/dialogs/wizdlg.cxx | 4 -
svtools/source/graphic/grfcache.cxx | 2
svtools/source/graphic/grfmgr.cxx | 2
svtools/source/inc/svimpbox.hxx | 4 -
svtools/source/misc/filechangedchecker.cxx | 4 -
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 2
svx/inc/svdibrow.hxx | 2
svx/source/dialog/_contdlg.cxx | 8 +--
svx/source/dialog/contimp.hxx | 4 -
svx/source/dialog/fontwork.cxx | 4 -
svx/source/dialog/graphctl.cxx | 4 -
svx/source/dialog/imapdlg.cxx | 4 -
svx/source/dialog/srchdlg.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 4 -
svx/source/form/datanavi.cxx | 6 +-
svx/source/form/filtnav.cxx | 2
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/formcontroller.cxx | 6 +-
svx/source/form/navigatortree.cxx | 4 -
svx/source/inc/datanavi.hxx | 2
svx/source/inc/formcontroller.hxx | 2
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 4 -
svx/source/sidebar/PanelLayout.cxx | 4 -
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 4 -
svx/source/sidebar/media/MediaPlaybackPanel.hxx | 2
svx/source/stbctrls/modctrl.cxx | 4 -
svx/source/svdraw/svdetc.cxx | 7 --
svx/source/svdraw/svdibrow.cxx | 4 -
svx/source/svdraw/svdpntv.cxx | 4 -
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 6 +-
svx/source/tbxctrls/itemwin.cxx | 2
sw/inc/doc.hxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 6 +-
sw/source/core/doc/DocumentStatisticsManager.cxx | 5 -
sw/source/core/doc/DocumentTimerManager.cxx | 4 -
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/htmltbl.cxx | 2
sw/source/core/docnode/threadmanager.cxx | 4 -
sw/source/core/inc/DocumentTimerManager.hxx | 2
sw/source/core/inc/threadmanager.hxx | 2
sw/source/core/text/blink.cxx | 2
sw/source/core/txtnode/SwGrammarContact.cxx | 2
sw/source/core/unocore/unochart.cxx | 2
sw/source/ui/dbui/mmoutputtypepage.cxx | 4 -
sw/source/ui/envelp/labfmt.cxx | 4 -
sw/source/ui/envelp/labfmt.hxx | 2
sw/source/ui/inc/mmresultdialogs.hxx | 2
sw/source/uibase/docvw/HeaderFooterWin.cxx | 2
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/edtdd.cxx | 6 +-
sw/source/uibase/docvw/edtwin.cxx | 10 +--
sw/source/uibase/docvw/srcedtw.cxx | 4 -
sw/source/uibase/fldui/fldwrap.cxx | 2
sw/source/uibase/inc/edtwin.hxx | 2
sw/source/uibase/inc/navipi.hxx | 2
sw/source/uibase/inc/srcedtw.hxx | 2
sw/source/uibase/inc/unotools.hxx | 2
sw/source/uibase/misc/redlndlg.cxx | 4 -
sw/source/uibase/misc/swruler.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uno/unomailmerge.cxx | 2
sw/source/uibase/utlui/content.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 4 -
sw/source/uibase/utlui/unotools.cxx | 4 -
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 2
vcl/backendtest/VisualBackendTest.cxx | 2
vcl/inc/svdata.hxx | 2
vcl/inc/unx/gtk/gtksalmenu.hxx | 2
vcl/source/app/help.cxx | 4 -
vcl/source/app/svapp.cxx | 4 -
vcl/source/control/edit.cxx | 2
vcl/source/control/menubtn.cxx | 2
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/control/scrbar.cxx | 4 -
vcl/source/control/spinbtn.cxx | 2
vcl/source/control/spinfld.cxx | 2
vcl/source/control/throbber.cxx | 2
vcl/source/edit/texteng.cxx | 4 -
vcl/source/edit/vclmedit.cxx | 2
vcl/source/gdi/animate.cxx | 4 -
vcl/source/window/cursor.cxx | 2
vcl/source/window/dockmgr.cxx | 12 ++--
vcl/source/window/dockwin.cxx | 10 +--
vcl/source/window/menufloatingwindow.cxx | 6 +-
vcl/source/window/paint.cxx | 4 -
vcl/source/window/scrwnd.cxx | 2
vcl/source/window/seleng.cxx | 2
vcl/source/window/syswin.cxx | 4 -
vcl/source/window/toolbox.cxx | 6 +-
vcl/source/window/window.cxx | 4 -
vcl/source/window/window2.cxx | 2
vcl/unx/generic/fontmanager/fontmanager.cxx | 2
vcl/unx/generic/print/genprnpsp.cxx | 6 +-
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/gtksalmenu.cxx | 4 -
vcl/workben/vcldemo.cxx | 2
290 files changed, 491 insertions(+), 523 deletions(-)
New commits:
commit bf110d40efcc79efb9247fdce5d2f54bafa6550b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Jan 23 19:37:51 2017 +0100
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
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 9feb1c1..a6c247b 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 0f257ef..18d4f55 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 0907555..65a10ba 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 de718d5..f055fdf 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 12b746a..4c5eba1 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 d1799d1..eac8232 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 a7d88ef..bd0b4cf 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 cc0aa7f..052506d 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 2ace04c..52b5434 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 d4af255..5e2e73b 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 6629323..c72efb3 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 8c331a2..2067180 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 fea7cf0..e0c9567 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 f69b2f8..fc91f44 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 45c819b0..23023bd 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 814ba4b..8743846 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 e21e81e..0e16751 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 185ffc6..a8ec9ef 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 947a7e8..60ee026 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 b4cb44e..5d970fe 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 402fb9c..9b6ff25 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 1da650d..f2161ec 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 3f831e7..4b8bad4 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 18ec128..59776c8 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 e537150..fcbbefe 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 12014af..07f26fd 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 fe52850..cd236db 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 0c46364..3f37b3a 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 a2fc7cc..298c68f 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 4621607..871c43a 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 4a4f7bb..50c5a9c 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 5858783..f781f0c 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 240698f..0ce4e2d 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 a6972ef..beef6ec 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 7485ad5..e2f2411 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 c3abc9a..ae6f6ea 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 cd81e87..a365cf6 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 08bb04e..6582b37 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 ccfca86..f191cee 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 810a78a..fa80d16 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 c240f47..636d82e 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 03fb8bb..343f703 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 7289032..88fe294 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 8d421ee..40ac617 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 0904e80..39e0057 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 23e0bd9..80519ed 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 0fe6ba6..2048994 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 04a0259..e81ff2c 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 0f0b54f..8019edc 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 b47421f..1b585f7 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 fc2b2aa..0d89b43 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 59022d7..c6f4e4d 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 3429248..cf0c262 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 028cfff..996c408 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 b62a03c..7afd210 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 c1dbe7b..117de63 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 d8f3a03..16bba2d 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 dfa7224..2cad1f8 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 8a7276c..6874feb 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 3946d33..f12391e 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 a0eacea..d795395 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 6472fde..685381f 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 2eef55d..25d00008 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 d78a4a7..85304a1 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 6d232a5..cd74f30 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 d776a5c..f9a5ebd 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 e3bd0d1..4b9768d 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 8ef48ea..164c673 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 99a3e4e..5bb490d 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 1ed1eb4..b5c06c5 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 9ffbb33..bea1e06 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 a172ced..441254a5 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 cadc840..d9b3109 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 ceee99b..d037504 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 0a1bc42..f9634e1 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 da18634..c4e9d88 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 9f9ffe1..cd21d66 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 83d1f3c..1bb4359 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 b4dab16..05e7524 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 284b38f..e328ab8 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 d820fb2..37bfc7a 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 bc63ae1..1c2da29 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 7492b88..856785e 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 dcf6862..52b9b90 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 c6d8fdb..4d9c489 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 8d79c2f..707cc12 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 a0c3b69..ac7a0d7 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 43fb1e2..af67814 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 e7d539f..49d9aa7 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 083e6e6..3dbcb34 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 1b5759b..ae214c2 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 e7028ee..4cc4fa7 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 348ca09..75b4c1c 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 62885da..02fe768 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 6f9a4d8..1098fae 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 bddccde..122d907 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 3830ff0..1502d62 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 5037236..c461867 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 7ceb121..3f494b7 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 15ddc13..b57a208 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 a5bf840..64e7d10 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 9bbd432..96bf26a 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 8d3b591..95a398e 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 954c132..6a48501 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 b823998..7e3c8a7 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 1bf3cba..23042c40 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 d997653..68afaff 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 f1b0556..5021cf2 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 5148a7c..4f5eca4 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 355d5b7..68cae21 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 367b73c..d423824 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 42c17b9..94b8752 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 03a6646..b5632ea 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 eff8461..10f50fd 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 963036a..03cbaeb 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 ff07820..d84f7a2 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 bed2f73..81edfe2 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 f2e2dfa..558f5ea 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 a7991fa..68fdba9 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 dba4b2e..e63b00d 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 6bfa541..fe63085 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 5998d39..54425e0 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 6b50687..3a22b6d 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 5d569b0..69afe42 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 6e3be2e..efcd407 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 9602323..3585996 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 9d5282e..eb16c49 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 fe837a7..a17a145 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 dbe30db..53ab4d8 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 23a42ac..47af1b7 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 967930a..9438660 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 190f5c0..8bdf71f 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 0f5fe0e..306f339 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 319d9b4..5d2697a 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 05a1734..b62fa85 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 cdb2448..6f8fee9 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 bcf3913..27a8c12 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list