diff options
| author | Jennifer Liebel <jliebel94@gmail.com> | 2014-11-18 13:07:45 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:34:59 +0000 |
| commit | 2a5500567544ef4e70528c0da0cf927d407dbf78 (patch) | |
| tree | cf059658b3f551d4b4e23851876ad4cda082f988 /sfx2 | |
| parent | 24afc4f09d29881159ed1f58d92b714c690534da (diff) | |
changed timers to idle
Change-Id: I0d2119a297c9a6d9b99676a561ddf4dd654ecaea
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 7ee9f083bda5..42be2b0eb04d 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -110,7 +110,7 @@ struct SfxDispatcher_Impl const SfxSlotServer* pCachedServ1; // last called message const SfxSlotServer* pCachedServ2; // penultimate called Message SfxShellStack_Impl aStack; // active functionality - Timer aTimer; // for Flush + Idle aIdle; // for Flush std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop SfxViewFrame* pFrame; // NULL or associated Frame SfxDispatcher* pParent; // AppDispatcher, NULL if possible @@ -338,8 +338,8 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) pImp->xPoster = new SfxHintPoster(aGenLink); - pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT); - pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); + pImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + pImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); } SfxDispatcher::SfxDispatcher( SfxDispatcher* pParent ) @@ -380,7 +380,7 @@ SfxDispatcher::~SfxDispatcher() #endif // So that no timer by Reschedule in PlugComm strikes the LeaveRegistrations - pImp->aTimer.Stop(); + pImp->aIdle.Stop(); pImp->xPoster->SetEventHdl( Link() ); // Notify the stack varialbles in Call_Impl @@ -474,14 +474,14 @@ void SfxDispatcher::Pop(SfxShell& rShell, sal_uInt16 nMode) if(!pSfxApp->IsDowning() && !pImp->aToDoStack.empty()) { // No immediate update is requested - pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT); - pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); - pImp->aTimer.Start(); + pImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + pImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); + pImp->aIdle.Start(); } else { // but to do nothing - pImp->aTimer.Stop(); + pImp->aIdle.Stop(); // Bindings may wake up again if(pImp->aToDoStack.empty()) @@ -685,9 +685,9 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI, SfxViewFrame* /* pOld */) if(!pImp->aToDoStack.empty()) { // No immediate update is requested - pImp->aTimer.SetTimeout(SFX_FLUSH_TIMEOUT); - pImp->aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); - pImp->aTimer.Start(); + pImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + pImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); + pImp->aIdle.Start(); } } @@ -1429,7 +1429,7 @@ void SfxDispatcher::FlushImpl() OSL_TRACE("Flushing dispatcher!"); - pImp->aTimer.Stop(); + pImp->aIdle.Stop(); if ( pImp->pParent ) pImp->pParent->Flush(); |