diff options
Diffstat (limited to 'sw/source')
33 files changed, 48 insertions, 49 deletions
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index e599555346fa..77a91eb24a49 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -75,7 +75,7 @@ DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rDoc { maStatsUpdateTimer.SetTimeout( 1 ); maStatsUpdateTimer.SetPriority( TaskPriority::LOWEST ); - maStatsUpdateTimer.SetTimeoutHdl( LINK( this, DocumentStatisticsManager, DoIdleStatsUpdate ) ); + maStatsUpdateTimer.SetInvokeHandler( LINK( this, DocumentStatisticsManager, DoIdleStatsUpdate ) ); maStatsUpdateTimer.SetDebugName( "sw::DocumentStatisticsManager maStatsUpdateTimer" ); } @@ -233,9 +233,8 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF return nChars < 0; } -IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) +IMPL_LINK_NOARG( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, void ) { - (void)pTimer; if (IncrementalDocStatCalculate(32000)) maStatsUpdateTimer.Start(); diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 6b5ce55f7e9e..d65f623a86a1 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -43,7 +43,7 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc maIdle("DocumentTimerManagerIdleTimer") { maIdle.SetPriority( TaskPriority::LOWEST ); - maIdle.SetIdleHdl( LINK( this, DocumentTimerManager, DoIdleJobs) ); + maIdle.SetInvokeHandler( LINK( this, DocumentTimerManager, DoIdleJobs) ); maIdle.SetDebugName( "sw::DocumentTimerManager maIdle" ); } @@ -80,7 +80,7 @@ void DocumentTimerManager::StartBackgroundJobs() maIdle.Start(); } -IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void ) +IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer*, pIdle, void ) { #ifdef TIMELOG static ::rtl::Logfile* pModLogFile = 0; diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 67628bfe5055..4c24f87000d3 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -769,7 +769,7 @@ void SwDoc::PrtOLENotify( bool bAll ) } } -IMPL_LINK_NOARG( SwDoc, DoUpdateModifiedOLE, Idle *, void ) +IMPL_LINK_NOARG( SwDoc, DoUpdateModifiedOLE, Timer *, void ) { SwFEShell* pSh = static_cast<SwFEShell*>(GetEditShell()); if( pSh ) diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 3190a2a1b878..b1a8faebd99a 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -330,7 +330,7 @@ SwDoc::SwDoc() getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD )); maOLEModifiedIdle.SetPriority( TaskPriority::LOWEST ); - maOLEModifiedIdle.SetIdleHdl( LINK( this, SwDoc, DoUpdateModifiedOLE )); + maOLEModifiedIdle.SetInvokeHandler( LINK( this, SwDoc, DoUpdateModifiedOLE )); maOLEModifiedIdle.SetDebugName( "sw::SwDoc maOLEModifiedIdle" ); #if HAVE_FEATURE_DBCONNECTIVITY diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index ec89c261ce3a..68e592f29fb2 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -215,7 +215,7 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable, , m_bMustNotResize( false ) , m_bMustNotRecalc( false ) { - m_aResizeTimer.SetTimeoutHdl( LINK( this, SwHTMLTableLayout, + m_aResizeTimer.SetInvokeHandler( LINK( this, SwHTMLTableLayout, DelayedResize_Impl ) ); } diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index db6efb524684..7be5fb769a2d 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -47,7 +47,7 @@ void ThreadManager::Init() mpThreadListener.reset( new ThreadListener( *this ) ); maStartNewThreadIdle.SetPriority( TaskPriority::LOWEST ); - maStartNewThreadIdle.SetIdleHdl( LINK( this, ThreadManager, TryToStartNewThread ) ); + maStartNewThreadIdle.SetInvokeHandler( LINK( this, ThreadManager, TryToStartNewThread ) ); } ThreadManager::~ThreadManager() @@ -202,7 +202,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) return bThreadStarted; } -IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread, Idle *, void) +IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread, Timer *, void) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index b8575192eba3..da4b9e4b30fd 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -48,7 +48,7 @@ public: void StartBackgroundJobs() override; // Our own 'IdleTimer' calls the following method - DECL_LINK( DoIdleJobs, Idle *, void ); + DECL_LINK( DoIdleJobs, Timer *, void ); virtual ~DocumentTimerManager() override; diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 51198ad08b7f..4c9dcff0b202 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -69,7 +69,7 @@ class ThreadManager final void RemoveThread( const oslInterlockedCount nThreadID, const bool bThreadFinished = false ); - DECL_LINK( TryToStartNewThread, Idle*, void ); + DECL_LINK( TryToStartNewThread, Timer*, void ); /** suspend the starting of threads diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 97d868d762f2..74fff44c60e9 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -42,7 +42,7 @@ SwBlink::SwBlink() bVisible = true; // Prepare the timer aTimer.SetTimeout( BLINK_ON_TIME ); - aTimer.SetTimeoutHdl( LINK(this, SwBlink, Blinker) ); + aTimer.SetInvokeHandler( LINK(this, SwBlink, Blinker) ); } SwBlink::~SwBlink( ) diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index eadc16cfcd0d..78ea24427659 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -62,7 +62,7 @@ protected: SwGrammarContact::SwGrammarContact() : mpProxyList(nullptr), mbFinished( false ) { aTimer.SetTimeout( 2000 ); // Repaint of grammar check after 'setChecked' - aTimer.SetTimeoutHdl( LINK(this, SwGrammarContact, TimerRepaint) ); + aTimer.SetInvokeHandler( LINK(this, SwGrammarContact, TimerRepaint) ); aTimer.SetDebugName( "sw::SwGrammarContact TimerRepaint" ); } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 8ae7d5bc8652..11e8fdb57068 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -90,7 +90,7 @@ SwChartLockController_Helper::SwChartLockController_Helper( SwDoc *pDocument ) : , bIsLocked( false ) { aUnlockTimer.SetTimeout( 1500 ); - aUnlockTimer.SetTimeoutHdl( LINK( this, SwChartLockController_Helper, DoUnlockAllCharts )); + aUnlockTimer.SetInvokeHandler( LINK( this, SwChartLockController_Helper, DoUnlockAllCharts )); aUnlockTimer.SetDebugName( "sw::SwChartLockController_Helper aUnlockTimer" ); } diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 24d8cd4d2a0b..eaee11750ad9 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -387,7 +387,7 @@ IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, pDialog, void ) static_cast<SwSendMailDialog*>(pDialog)->SendMails(); } -IMPL_LINK( SwSendMailDialog, RemoveThis, Idle*, pTimer, void ) +IMPL_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer, void ) { if( m_pImpl->xMailDispatcher.is() ) { @@ -537,7 +537,7 @@ void SwSendMailDialog::StateChanged( StateChangedType nStateChange ) ModelessDialog::StateChanged( nStateChange ); if(StateChangedType::Visible == nStateChange && !IsVisible()) { - m_pImpl->aRemoveIdle.SetIdleHdl( LINK( this, SwSendMailDialog, + m_pImpl->aRemoveIdle.SetInvokeHandler( LINK( this, SwSendMailDialog, RemoveThis ) ); m_pImpl->aRemoveIdle.Start(); } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index f57c4bd1854a..a6673a180c85 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -354,7 +354,7 @@ SwLabFormatPage::SwLabFormatPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pSavePB->SetClickHdl( LINK (this, SwLabFormatPage, SaveHdl)); // Set timer aPreviewIdle.SetPriority(TaskPriority::LOWEST); - aPreviewIdle.SetIdleHdl(LINK(this, SwLabFormatPage, PreviewHdl)); + aPreviewIdle.SetInvokeHandler(LINK(this, SwLabFormatPage, PreviewHdl)); } SwLabFormatPage::~SwLabFormatPage() @@ -390,7 +390,7 @@ IMPL_LINK_NOARG(SwLabFormatPage, ModifyHdl, Edit&, void) } // Invalidate preview -IMPL_LINK_NOARG(SwLabFormatPage, PreviewHdl, Idle *, void) +IMPL_LINK_NOARG(SwLabFormatPage, PreviewHdl, Timer *, void) { aPreviewIdle.Stop(); ChangeMinMax(); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 24e6d3460569..1d26b342da78 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -88,7 +88,7 @@ class SwLabFormatPage : public SfxTabPage SwLabItem aItem; DECL_LINK( ModifyHdl, Edit&, void ); - DECL_LINK( PreviewHdl, Idle *, void ); + DECL_LINK( PreviewHdl, Timer *, void ); DECL_LINK( LoseFocusHdl, Control&, void ); DECL_LINK( SaveHdl, Button*, void ); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 435eee91c8f7..c3ca717bc015 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -199,7 +199,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog DECL_LINK( CloseHdl_Impl, Button* , void); DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, void ); DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, void ); - DECL_LINK( RemoveThis, Idle*, void ); + DECL_LINK( RemoveThis, Timer*, void ); void IterateMails(); void SendMails(); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index dea74020b11f..b7c7fecf02c3 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -161,7 +161,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame *pFrame SetPopupMenu(m_pPopupMenu); m_aFadeTimer.SetTimeout(50); - m_aFadeTimer.SetTimeoutHdl(LINK(this, SwHeaderFooterWin, FadeHandler)); + m_aFadeTimer.SetInvokeHandler(LINK(this, SwHeaderFooterWin, FadeHandler)); } SwHeaderFooterWin::~SwHeaderFooterWin( ) diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index b4056c29b474..a3e4fa8735b9 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -113,7 +113,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame ) : SetPopupMenu( m_pPopupMenu ); m_aFadeTimer.SetTimeout( 50 ); - m_aFadeTimer.SetTimeoutHdl( LINK( this, SwPageBreakWin, FadeHandler ) ); + m_aFadeTimer.SetInvokeHandler( LINK( this, SwPageBreakWin, FadeHandler ) ); } SwPageBreakWin::~SwPageBreakWin( ) diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 63df592cd612..f4d8f7c160df 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -48,7 +48,7 @@ bool g_bExecuteDrag = false; void SwEditWin::StartDDTimer() { - m_aTimer.SetTimeoutHdl(LINK(this, SwEditWin, DDHandler)); + m_aTimer.SetInvokeHandler(LINK(this, SwEditWin, DDHandler)); m_aTimer.SetTimeout(480); m_aTimer.Start(); g_bDDTimerStarted = true; @@ -60,7 +60,7 @@ void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt) g_bDDTimerStarted = false; if(!pSh->IsSelFrameMode()) pSh->CallSetCursor(&rPt, false); - m_aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler)); + m_aTimer.SetInvokeHandler(LINK(this,SwEditWin, TimerHandler)); } void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) @@ -144,7 +144,7 @@ void SwEditWin::StartExecuteDrag() void SwEditWin::DragFinished() { DropCleanup(); - m_aTimer.SetTimeoutHdl( LINK(this,SwEditWin, TimerHandler) ); + m_aTimer.SetInvokeHandler( LINK(this,SwEditWin, TimerHandler) ); m_bIsInDrag = false; } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index eac6d39cfc43..8869510ec434 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5085,19 +5085,19 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView): SetMapMode(MapMode(MapUnit::MapTwip)); SetPointer( PointerStyle::Text ); - m_aTimer.SetTimeoutHdl(LINK(this, SwEditWin, TimerHandler)); + m_aTimer.SetInvokeHandler(LINK(this, SwEditWin, TimerHandler)); m_bTableInsDelMode = false; m_aKeyInputTimer.SetTimeout( 3000 ); - m_aKeyInputTimer.SetTimeoutHdl(LINK(this, SwEditWin, KeyInputTimerHandler)); + m_aKeyInputTimer.SetInvokeHandler(LINK(this, SwEditWin, KeyInputTimerHandler)); m_aKeyInputFlushTimer.SetTimeout( 200 ); - m_aKeyInputFlushTimer.SetTimeoutHdl(LINK(this, SwEditWin, KeyInputFlushHandler)); + m_aKeyInputFlushTimer.SetInvokeHandler(LINK(this, SwEditWin, KeyInputFlushHandler)); // TemplatePointer for colors should be resetted without // selection after single click m_aTemplateIdle.SetPriority(TaskPriority::LOWEST); - m_aTemplateIdle.SetIdleHdl(LINK(this, SwEditWin, TemplateTimerHdl)); + m_aTemplateIdle.SetInvokeHandler(LINK(this, SwEditWin, TemplateTimerHdl)); // temporary solution!!! Should set the font of the current // insert position at every cursor movement! @@ -5908,7 +5908,7 @@ void SwEditWin::StopQuickHelp() m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } -IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Idle *, void) +IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Timer *, void) { SetApplyTemplate(SwApplyTemplate()); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 0a5de7f7d953..0033a5a357e7 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -537,7 +537,7 @@ void SwSrcEditWindow::CreateTextEngine() m_pTextEngine->SetFont( aFont ); m_aSyntaxIdle.SetPriority( TaskPriority::LOWER ); - m_aSyntaxIdle.SetIdleHdl( LINK( this, SwSrcEditWindow, SyntaxTimerHdl ) ); + m_aSyntaxIdle.SetInvokeHandler( LINK( this, SwSrcEditWindow, SyntaxTimerHdl ) ); m_pTextEngine->EnableUndo( true ); m_pTextEngine->SetUpdateMode( true ); @@ -593,7 +593,7 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); } -IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) +IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer*, pIdle, void ) { tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(m_pTextView == nullptr, "sw", "No View yet, but syntax highlighting?!"); diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 9380d20924c5..ddeb77e33ad0 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -43,7 +43,7 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) { // avoid flickering of buttons: m_aUpdateTimer.SetTimeout(200); - m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); + m_aUpdateTimer.SetInvokeHandler(LINK(this, SwChildWinWrapper, UpdateHdl)); } IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl, Timer *, void) diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 474d0417b5ac..7c666ba77ef6 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -179,7 +179,7 @@ friend void PageNumNotify( SwViewShell* pVwSh, DECL_LINK( KeyInputTimerHandler, Timer *, void ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) - DECL_LINK( TemplateTimerHdl, Idle *, void ); + DECL_LINK( TemplateTimerHdl, Timer *, void ); void MoveCursor( SwWrtShell &rSh, const Point& rDocPos, const bool bOnlyText, bool bLockView ); diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index e6ca29eef065..1c650ca360cf 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -113,7 +113,7 @@ class SwNavigationPI : public PanelLayout, DECL_LINK( EditGetFocus, Control&, void ); DECL_LINK( DoneLink, SfxPoolItem *, void ); DECL_LINK( MenuSelectHdl, Menu *, bool ); - DECL_LINK( ChangePageHdl, Idle*, void ); + DECL_LINK( ChangePageHdl, Timer*, void ); DECL_LINK( PageEditModifyHdl, SpinField&, void ); DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void ); diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index ee60c2814622..a94e10af1f33 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -92,7 +92,7 @@ private: using OutputDevice::SetFont; void SetFont(); - DECL_LINK( SyntaxTimerHdl, Idle *, void ); + DECL_LINK( SyntaxTimerHdl, Timer *, void ); using Window::Invalidate; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index a2e4988ee9af..c3c48705e969 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwOneExampleFrame static bool bShowServiceNotAvailableMessage; - DECL_DLLPRIVATE_LINK( TimeoutHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void ); DECL_DLLPRIVATE_LINK( PopupHdl, Menu*, bool ); SAL_DLLPRIVATE void CreateControl(); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index bc5c1c64ba59..746ccd9c745d 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -217,11 +217,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer // avoid flickering of buttons: m_aDeselectTimer.SetTimeout(100); - m_aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectTimerHdl)); + m_aDeselectTimer.SetInvokeHandler(LINK(this, SwRedlineAcceptDlg, SelectTimerHdl)); // avoid multiple selection of the same texts: m_aSelectTimer.SetTimeout(100); - m_aSelectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, GotoHdl)); + m_aSelectTimer.SetInvokeHandler(LINK(this, SwRedlineAcceptDlg, GotoHdl)); } SwRedlineAcceptDlg::~SwRedlineAcceptDlg() diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 89c4b5142acb..6ce0db3ad389 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -76,7 +76,7 @@ SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEd { // Set fading timeout: 5 x 40ms = 200ms maFadeTimer.SetTimeout(40); - maFadeTimer.SetTimeoutHdl( LINK( this, SwCommentRuler, FadeHandler ) ); + maFadeTimer.SetInvokeHandler( LINK( this, SwCommentRuler, FadeHandler ) ); maFadeTimer.SetDebugName( "sw::SwCommentRuler maFadeTimer" ); } diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index f01a65fac41f..9e25f428c9c1 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -996,7 +996,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_aTimer.Stop(); } - m_aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl)); + m_aTimer.SetInvokeHandler(LINK(this, SwView, TimeoutHdl)); m_aTimer.SetDebugName( "sw::SwView m_aTimer" ); m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = false; if (bOldModifyFlag) diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 5f73576d2fed..e482fc224f61 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -292,7 +292,7 @@ namespace } m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds - m_aDeleteTimer.SetTimeoutHdl( LINK( this, DelayedFileDeletion, OnTryDeleteFile ) ); + m_aDeleteTimer.SetInvokeHandler( LINK( this, DelayedFileDeletion, OnTryDeleteFile ) ); m_nPendingDeleteAttempts = 3; // try 3 times at most m_aDeleteTimer.Start( ); } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index b5ec8107b975..fb66deaa091f 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -813,7 +813,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog) m_aContextStrings[i] = SW_RESSTR(i+STR_CONTEXT_FIRST); } m_nActiveBlock = m_pConfig->GetActiveBlock(); - m_aUpdTimer.SetTimeoutHdl(LINK(this, SwContentTree, TimerUpdate)); + m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate)); m_aUpdTimer.SetTimeout(1000); Clear(); EnableContextMenuHandling(); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 79eed51b5295..76afe40eb09b 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -151,7 +151,7 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog) DragDropMode::ENABLE_TOP ); aUpdateTimer.SetTimeout(GLOBAL_UPDATE_TIMEOUT); - aUpdateTimer.SetTimeoutHdl(LINK(this, SwGlobalTree, Timeout)); + aUpdateTimer.SetInvokeHandler(LINK(this, SwGlobalTree, Timeout)); aUpdateTimer.Start(); for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++) { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 99e144df55f5..6aff4df8deda 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -723,7 +723,7 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, else m_aContentTree->GrabFocus(); UsePage(); - m_aPageChgIdle.SetIdleHdl(LINK(this, SwNavigationPI, ChangePageHdl)); + m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl)); m_aPageChgIdle.SetPriority(TaskPriority::LOWEST); m_aContentTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT)); @@ -1153,7 +1153,7 @@ bool SwNavigationPI::IsGlobalDoc() const return bRet; } -IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl, Idle *, void) +IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl, Timer *, void) { if (!IsDisposed()) { diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 59d3afbda8c7..80c0f47545a0 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -82,7 +82,7 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, aInitializedLink = *pInitializedLink; // the controller is asynchronously set - aLoadedIdle.SetIdleHdl(LINK(this, SwOneExampleFrame, TimeoutHdl)); + aLoadedIdle.SetInvokeHandler(LINK(this, SwOneExampleFrame, TimeoutHdl)); aLoadedIdle.SetPriority(TaskPriority::HIGH); CreateControl(); @@ -193,7 +193,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xVie } } -IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) +IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) { if(!_xControl.is()) return; |