From 49524c6dcf04b9dadef8d2b084cf26abcf70b8a9 Mon Sep 17 00:00:00 2001 From: Jennifer Liebel Date: Wed, 14 Jan 2015 09:25:30 +0000 Subject: idle includes and enum use Change-Id: I8a280c54d81c7da74c9ab03ff3fc788e373ca4e4 --- sfx2/source/appl/appcfg.cxx | 3 ++- sfx2/source/control/dispatch.cxx | 7 ++++--- sfx2/source/dialog/basedlgs.cxx | 7 ++++--- sfx2/source/dialog/dockwin.cxx | 7 ++++--- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 14897f8411d5..59ab0f950acb 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -114,7 +115,7 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) StartListening( *rHint.GetObjShell() ); pIdle = new Idle; pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, TimerHdl) ); - pIdle->SetPriority( VCL_IDLE_PRIORITY_HIGHEST ); + pIdle->SetPriority( IdlePriority::VCL_IDLE_PRIORITY_HIGHEST ); pIdle->Start(); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 930ed0b07d83..1bd1ab42902a 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -336,7 +337,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) xImp->xPoster = new SfxHintPoster(aGenLink); - xImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + xImp->aIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_MEDIUM); xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); } @@ -472,7 +473,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, sal_uInt16 nMode) if(!pSfxApp->IsDowning() && !xImp->aToDoStack.empty()) { // No immediate update is requested - xImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + xImp->aIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_MEDIUM); xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); xImp->aIdle.Start(); } @@ -683,7 +684,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI, SfxViewFrame* /* pOld */) if(!xImp->aToDoStack.empty()) { // No immediate update is requested - xImp->aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM); + xImp->aIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_MEDIUM); xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); xImp->aIdle.Start(); } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index be56e6c8516b..cde726766a33 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -318,7 +319,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) SetUniqueId( GetHelpId() ); if ( pBindinx ) pImp->StartListening( *pBindinx ); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxModelessDialog,TimerHdl)); } @@ -457,7 +458,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } @@ -478,7 +479,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, if ( pBindinx ) pImp->StartListening( *pBindinx ); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index f7367ed0fbef..d7b685c9c476 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -888,7 +889,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); } @@ -939,7 +940,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); } @@ -987,7 +988,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT); - pImp->aMoveIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); + pImp->aMoveIdle.SetPriority(IdlePriority::VCL_IDLE_PRIORITY_RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); } -- cgit