diff options
Diffstat (limited to 'sc')
32 files changed, 50 insertions, 50 deletions
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 5037236ffece..c461867eae5a 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -145,7 +145,7 @@ private: Idle aIdle; ScDocument* pDoc; - DECL_LINK(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Timer *, void); ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 7ceb1212dd1d..3f494b7dca6f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2028,7 +2028,7 @@ private: SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, sal_uLong nProAdd ); - DECL_LINK(TrackTimeHdl, Idle *, void); + DECL_LINK(TrackTimeHdl, Timer *, void); static ScRecursionHelper* CreateRecursionHelperInstance(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 15ddc133fdf0..b57a208e297d 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -124,7 +124,7 @@ public: // moved by the application DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle - DECL_LINK( SpellTimerHdl, Idle*, void ); + DECL_LINK( SpellTimerHdl, Timer*, void ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); void Execute( SfxRequest& rReq ); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index a5bf84093710..64e7d10a4aa5 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -248,7 +248,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : // languages for a visible document are set by docshell later (from options) SetLanguage( ScGlobal::eLnge, ScGlobal::eLnge, ScGlobal::eLnge ); - aTrackIdle.SetIdleHdl( LINK( this, ScDocument, TrackTimeHdl ) ); + aTrackIdle.SetInvokeHandler( LINK( this, ScDocument, TrackTimeHdl ) ); aTrackIdle.SetPriority( TaskPriority::LOW ); } @@ -321,7 +321,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) pChangeTrack = pTrack; } -IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Idle *, void) +IMPL_LINK_NOARG(ScDocument, TrackTimeHdl, Timer *, void) { if ( ScDdeLink::IsInUpdate() ) // do not nest { diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 9bbd432a6e05..96bf26a26a6c 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -402,7 +402,7 @@ ScChartHiddenRangeListener::~ScChartHiddenRangeListener() void ScChartListenerCollection::Init() { - aIdle.SetIdleHdl( LINK( this, ScChartListenerCollection, TimerHdl ) ); + aIdle.SetInvokeHandler( LINK( this, ScChartListenerCollection, TimerHdl ) ); aIdle.SetPriority( TaskPriority::REPAINT ); aIdle.SetDebugName( "sc::ScChartListenerCollection aIdle" ); } @@ -597,7 +597,7 @@ void ScChartListenerCollection::StartTimer() aIdle.Start(); } -IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl, Timer *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 8d3b59145369..95a398e1538a 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -146,7 +146,7 @@ ScTemporaryChartLock::ScTemporaryChartLock( ScDocument* pDocP ) : mpDoc( pDocP ) { maTimer.SetTimeout( SC_CHARTLOCKTIMEOUT ); - maTimer.SetTimeoutHdl( LINK( this, ScTemporaryChartLock, TimeoutHdl ) ); + maTimer.SetInvokeHandler( LINK( this, ScTemporaryChartLock, TimeoutHdl ) ); } ScTemporaryChartLock::~ScTemporaryChartLock() diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx index 954c132d25c3..6a48501e9c03 100644 --- a/sc/source/core/tool/refreshtimer.cxx +++ b/sc/source/core/tool/refreshtimer.cxx @@ -91,7 +91,7 @@ void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp ) void ScRefreshTimer::SetRefreshHandler( const Link<Timer *, void>& rLink ) { - SetTimeoutHdl( rLink ); + SetInvokeHandler( rLink ); } sal_uLong ScRefreshTimer::GetRefreshDelay() const diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b823998e5bdb..7e3c8a7e6130 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -648,7 +648,7 @@ ScInputHandler::ScInputHandler() pDelayTimer = new Timer( "ScInputHandlerDelay timer" ); pDelayTimer->SetTimeout( 500 ); // 500 ms delay - pDelayTimer->SetTimeoutHdl( LINK( this, ScInputHandler, DelayTimer ) ); + pDelayTimer->SetInvokeHandler( LINK( this, ScInputHandler, DelayTimer ) ); } ScInputHandler::~ScInputHandler() diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 1bf3cba85b87..23042c406f3b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -180,11 +180,11 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : GetResMgr() ); aSpellIdle.SetPriority(TaskPriority::LOWER); - aSpellIdle.SetIdleHdl( LINK( this, ScModule, SpellTimerHdl ) ); + aSpellIdle.SetInvokeHandler( LINK( this, ScModule, SpellTimerHdl ) ); aSpellIdle.SetDebugName( "sc::ScModule aSpellIdle" ); aIdleTimer.SetTimeout(SC_IDLE_MIN); - aIdleTimer.SetTimeoutHdl( LINK( this, ScModule, IdleHandler ) ); + aIdleTimer.SetInvokeHandler( LINK( this, ScModule, IdleHandler ) ); aIdleTimer.SetDebugName( "sc::ScModule aIdleTimer" ); aIdleTimer.Start(); @@ -1905,7 +1905,7 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void) aIdleTimer.Start(); } -IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScModule, SpellTimerHdl, Timer *, void) { if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index d99765300abd..68afaffb9451 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -53,7 +53,7 @@ ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pPa mnMenuPos(MENU_NOT_SELECTED), mpParent(pParent) { - maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) ); + maTimer.SetInvokeHandler( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) ); maTimer.SetTimeout(mpParent->GetSettings().GetMouseSettings().GetMenuDelay()); } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index f1b055697e94..5021cf2f9710 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -108,7 +108,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar // Hack: RefInput control pTimer = new Timer("ScFilterTimer"); pTimer->SetTimeout( 50 ); // Wait 50ms - pTimer->SetTimeoutHdl( LINK( this, ScFilterDlg, TimeOutHdl ) ); + pTimer->SetInvokeHandler( LINK( this, ScFilterDlg, TimeOutHdl ) ); } ScFilterDlg::~ScFilterDlg() diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 5148a7cd059b..4f5eca4ba884 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -89,7 +89,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc pIdle = new Idle; // FIXME: this is an abomination pIdle->SetPriority( TaskPriority::LOWEST ); - pIdle->SetIdleHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) ); + pIdle->SetInvokeHandler( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) ); pIdle->Start(); } @@ -396,7 +396,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) } } -IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) +IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, void ) { // every 50ms check whether RefInputMode is still true diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 355d5b7851df..68cae217c652 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -63,8 +63,8 @@ ScAutoStyleList::ScAutoStyleList(ScDocShell* pShell) , aInitIdle("ScAutoStyleList InitIdle") , nTimerStart(0) { - aTimer.SetTimeoutHdl( LINK( this, ScAutoStyleList, TimerHdl ) ); - aInitIdle.SetIdleHdl( LINK( this, ScAutoStyleList, InitHdl ) ); + aTimer.SetInvokeHandler( LINK( this, ScAutoStyleList, TimerHdl ) ); + aInitIdle.SetInvokeHandler( LINK( this, ScAutoStyleList, InitHdl ) ); aInitIdle.SetPriority( TaskPriority::HIGHEST ); } @@ -81,7 +81,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1 aInitIdle.Start(); } -IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Idle *, void) +IMPL_LINK_NOARG(ScAutoStyleList, InitHdl, Timer *, void) { std::vector<ScAutoStyleInitData>::iterator iter; for (iter = aInitials.begin(); iter != aInitials.end(); ++iter) diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 367b73c2a842..d42382478a7b 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -317,7 +317,7 @@ DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange& mbIsUpdate(false) { maImportTimer.SetTimeout(0); - maImportTimer.SetTimeoutHdl( LINK(this, DataStream, ImportTimerHdl) ); + maImportTimer.SetInvokeHandler( LINK(this, DataStream, ImportTimerHdl) ); Decode(rURL, rRange, nLimit, eMove, nSettings); } diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 42c17b937db9..94b8752f429e 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1681,7 +1681,7 @@ ScExternalRefManager::ScExternalRefManager(ScDocument* pDoc) : mbUserInteractionEnabled(true), mbDocTimerEnabled(true) { - maSrcDocTimer.SetTimeoutHdl( LINK(this, ScExternalRefManager, TimeOutHdl) ); + maSrcDocTimer.SetInvokeHandler( LINK(this, ScExternalRefManager, TimeOutHdl) ); maSrcDocTimer.SetTimeout(SRCDOC_SCAN_INTERVAL); maSrcDocTimer.SetDebugName( "sc::ScExternalRefManager maSrcDocTimer" ); } diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 03a6646b57b7..b5632ea7a02d 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -42,10 +42,10 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, // remember MouseButton state mnCode(0) { - aScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, ScrollHdl) ); + aScrollTimer.SetInvokeHandler( LINK(this, FuPoor, ScrollHdl) ); aScrollTimer.SetTimeout(SELENG_AUTOREPEAT_INTERVAL); - aDragTimer.SetTimeoutHdl( LINK(this, FuPoor, DragTimerHdl) ); + aDragTimer.SetInvokeHandler( LINK(this, FuPoor, DragTimerHdl) ); aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT); } diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index eff8461682fe..10f50fddccaf 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -104,10 +104,10 @@ private: DECL_LINK( SelectHandle, SvTreeListBox*, void ); DECL_LINK( RefInfoHandle, const OUString*, void ); - DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( UpdateSelectionHdl, Timer*, void ); DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void ); DECL_LINK( CommandHdl, SvSimpleTable*, void ); - DECL_LINK( ReOpenTimerHdl, Idle*, void ); + DECL_LINK( ReOpenTimerHdl, Timer*, void ); DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 ); protected: diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 963036a1d7ef..03cbaeb182a8 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -120,7 +120,7 @@ private: Idle aIdle; OUString aDocName; // document on which the dialog was opened - DECL_LINK( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Timer*, void ); protected: void disposeRefHandler(); diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index ff078209911b..d84f7a2a077e 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -64,7 +64,7 @@ private: void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); DECL_LINK( TimerHdl, Timer*, void ); - DECL_LINK( InitHdl, Idle*, void ); + DECL_LINK( InitHdl, Timer*, void ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index bed2f73a2707..81edfe2a1a71 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -151,7 +151,7 @@ private: DECL_LINK( SelectHandle, SvTreeListBox*, void ); DECL_LINK( DeselectHandle, SvTreeListBox*, void ); - DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( UpdateSelectionHdl, Timer*, void ); DECL_LINK( KeepMineHandle, Button*, void ); DECL_LINK( KeepOtherHandle, Button*, void ); DECL_LINK( KeepAllMineHandle, Button*, void ); diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index f2e2dfa735c6..558f5eae00d0 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -220,7 +220,7 @@ private: DECL_LINK( EndDlgHdl, Button*, void ); // Hack: RefInput control - DECL_LINK( TimeOutHdl, Idle*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index a7991fa77358..68fdba9be8fb 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -214,7 +214,7 @@ private: ScNavigatorControllerItem** ppBoundItems; - DECL_LINK(TimeHdl, Idle*, void); + DECL_LINK(TimeHdl, Timer*, void); DECL_LINK(DocumentSelectHdl, ListBox&, void); DECL_LINK(ToolBoxSelectHdl, ToolBox*, void); DECL_LINK(ToolBoxDropdownClickHdl, ToolBox*, void); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index dba4b2e3071d..e63b00d8161c 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -108,7 +108,7 @@ private: sal_uInt16 nSelected; OString aSelectedIdent; - DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( TimerHdl, Timer*, void ); protected: diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 6bfa541b1288..fe63085338f9 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -109,13 +109,13 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window nAcceptCount=0; nRejectCount=0; aReOpenIdle.SetPriority(TaskPriority::MEDIUM); - aReOpenIdle.SetIdleHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl )); + aReOpenIdle.SetInvokeHandler(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl )); pTPFilter=m_pAcceptChgCtr->GetFilterPage(); pTPView=m_pAcceptChgCtr->GetViewPage(); pTheView=pTPView->GetTableControl(); aSelectionIdle.SetPriority(TaskPriority::LOW); - aSelectionIdle.SetIdleHdl(LINK( this, ScAcceptChgDlg, UpdateSelectionHdl )); + aSelectionIdle.SetInvokeHandler(LINK( this, ScAcceptChgDlg, UpdateSelectionHdl )); aSelectionIdle.SetDebugName( "ScAcceptChgDlg aSelectionIdle" ); pTPFilter->SetReadyHdl(LINK( this, ScAcceptChgDlg, FilterHandle )); @@ -1610,14 +1610,14 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void) aMsgQueue.clear(); } -IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl, Timer *, void) { ScSimpleRefDlgWrapper::SetAutoReOpen(true); m_pAcceptChgCtr->ShowFilterPage(); RefHandle(nullptr); } -IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Timer *, void) { ScTabView* pTabView = pViewData->GetView(); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 5998d3991eb5..54425e0fee65 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -765,7 +765,7 @@ ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef { m_aHelper.SetWindow(m_rWindow.get()); aIdle.SetPriority(TaskPriority::LOWER); - aIdle.SetIdleHdl(LINK( this, ScRefHandler, UpdateFocusHdl)); + aIdle.SetInvokeHandler(LINK( this, ScRefHandler, UpdateFocusHdl)); if( bBindRef ) EnterRefMode(); } @@ -937,7 +937,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* m_aHelper.ToggleCollapsed( pEdit, pButton ); } -IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Timer *, void) { if (pActiveWin) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 6b5068742251..3a22b6dc787c 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -422,7 +422,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD m_pLbConflicts->SetHighlightRange(); maSelectionIdle.SetPriority( TaskPriority::LOW ); - maSelectionIdle.SetIdleHdl( LINK( this, ScConflictsDlg, UpdateSelectionHdl ) ); + maSelectionIdle.SetInvokeHandler( LINK( this, ScConflictsDlg, UpdateSelectionHdl ) ); maSelectionIdle.SetDebugName( "ScConflictsDlg maSelectionIdle" ); m_pLbConflicts->SetSelectHdl( LINK( this, ScConflictsDlg, SelectHandle ) ); @@ -564,7 +564,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) mbInDeselectHdl = false; } -IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) +IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl, Timer *, void) { if ( !mpViewData || !mpOwnDoc ) { diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 5d569b0ffbd8..69afe42fe9ec 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -131,7 +131,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) m_pBtnFromFile->Check(); SetFromTo_Impl(); - aBrowseTimer.SetTimeoutHdl( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) ); + aBrowseTimer.SetInvokeHandler( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) ); aBrowseTimer.SetTimeout( 200 ); } } diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 6e3be2ef8b26..efcd4070f109 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -527,7 +527,7 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, bool bSidebar, vcl::Window* pPar aContentBox->Hide(); aScenarioBox->Hide(); - aContentIdle.SetIdleHdl( LINK( this, ScNavigatorDlg, TimeHdl ) ); + aContentIdle.SetInvokeHandler( LINK( this, ScNavigatorDlg, TimeHdl ) ); aContentIdle.SetPriority( TaskPriority::LOWEST ); if (bInSidebar) @@ -649,7 +649,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK( ScNavigatorDlg, TimeHdl, Idle*, pIdle, void ) +IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pIdle, void ) { if ( pIdle != &aContentIdle ) return; diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 960232381d01..3585996edfba 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -367,7 +367,7 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { if(!aIdle.IsActive()) { - aIdle.SetIdleHdl(LINK( this, ScExtIButton, TimerHdl)); + aIdle.SetInvokeHandler(LINK( this, ScExtIButton, TimerHdl)); aIdle.Start(); } @@ -377,14 +377,14 @@ void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) void ScExtIButton::MouseButtonUp( const MouseEvent& rMEvt) { aIdle.Stop(); - aIdle.SetIdleHdl(Link<Idle *, void>()); + aIdle.ClearInvokeHandler(); ImageButton::MouseButtonUp(rMEvt ); } void ScExtIButton::Click() { aIdle.Stop(); - aIdle.SetIdleHdl(Link<Idle *, void>()); + aIdle.ClearInvokeHandler(); ImageButton::Click(); } @@ -423,7 +423,7 @@ bool ScExtIButton::PreNotify( NotifyEvent& rNEvt ) return ImageButton::PreNotify(rNEvt ); } -IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Idle *, void) +IMPL_LINK_NOARG(ScExtIButton, TimerHdl, Timer *, void) { StartPopup(); } diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 9d5282e58a77..eb16c4972b41 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -59,7 +59,7 @@ ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* Rectangle aVisPixel( Point( 0, 0 ), aSizePixel ); aVisRect = pWindow->PixelToLogic( aVisPixel, aMapMode ); - aTimer.SetTimeoutHdl( LINK( this, ScNoteMarker, TimeHdl ) ); + aTimer.SetInvokeHandler( LINK( this, ScNoteMarker, TimeHdl ) ); aTimer.SetTimeout( bForce ? SC_NOTEMARK_SHORT : SC_NOTEMARK_TIME ); aTimer.Start(); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index fe837a7794d8..a17a1451c078 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -72,7 +72,7 @@ void ScTabView::Init() mbInlineWithScrollbar = officecfg::Office::Calc::Layout::Other::TabbarInlineWithScrollbar::get(); aScrollTimer.SetTimeout(10); - aScrollTimer.SetTimeoutHdl( LINK( this, ScTabView, TimerHdl ) ); + aScrollTimer.SetInvokeHandler( LINK( this, ScTabView, TimerHdl ) ); for (i=0; i<4; i++) pGridWin[i] = nullptr; diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index dbe30db24e91..53ab4d81f946 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -29,7 +29,7 @@ ScAddInResult::ScAddInResult(const String& rStr) : nTickCount( 0 ) { aTimer.SetTimeout( 1000 ); - aTimer.SetTimeoutHdl( LINK( this, ScAddInResult, TimeoutHdl ) ); + aTimer.SetInvokeHandler( LINK( this, ScAddInResult, TimeoutHdl ) ); aTimer.Start(); } |