diff options
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/inc/layact.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 897dc7eb9695..a3c4e7ca74d0 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -70,7 +70,7 @@ class SwLayAction std::clock_t nStartTicks; // The Action's starting time; if too much time passes the // WaitCrsr can be enabled via CheckWaitCrsr() - sal_uInt16 nInputType; // Which input should terminate processing + VclInputFlags nInputType; // Which input should terminate processing sal_uInt16 nEndPage; // StatBar control sal_uInt16 nCheckPageNum; // CheckPageDesc() was delayed if != USHRT_MAX // check from this page onwards @@ -137,13 +137,13 @@ public: bool IsPaintExtraData() const { return bPaintExtraData;} bool IsInterrupt() const { return IsInput(); } - sal_uInt16 GetInputType() const { return nInputType; } + VclInputFlags GetInputType() const { return nInputType; } // adjusting Action to the wanted behaviour void SetPaint ( bool bNew ) { bPaint = bNew; } void SetComplete ( bool bNew ) { bComplete = bNew; } void SetStatBar ( bool bNew ); - void SetInputType ( sal_uInt16 nNew ) { nInputType = nNew; } + void SetInputType ( VclInputFlags nNew ) { nInputType = nNew; } void SetCalcLayout ( bool bNew ) { bCalcLayout = bNew; } void SetReschedule ( bool bNew ) { bReschedule = bNew; } void SetWaitAllowed ( bool bNew ) { bWaitAllowed = bNew; } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 75978819b1cb..71093be75c76 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -113,7 +113,7 @@ void SwLayAction::CheckWaitCrsr() inline void SwLayAction::CheckIdleEnd() { if ( !IsInput() ) - bInput = GetInputType() && Application::AnyInput( GetInputType() ); + bInput = bool(GetInputType()) && Application::AnyInput( GetInputType() ); } void SwLayAction::SetStatBar( bool bNew ) @@ -283,7 +283,7 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) : pWait( 0 ), nPreInvaPage( USHRT_MAX ), nStartTicks( std::clock() ), - nInputType( 0 ), + nInputType( VclInputFlags::NONE ), nEndPage( USHRT_MAX ), nCheckPageNum( USHRT_MAX ) { @@ -308,7 +308,7 @@ void SwLayAction::Reset() { pOptTab = 0; nStartTicks = std::clock(); - nInputType = 0; + nInputType = VclInputFlags::NONE; nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX; bPaint = bComplete = bWaitAllowed = bCheckPages = true; bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule = @@ -1935,7 +1935,7 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) bAllValid = false; if ( aRepaint.HasArea() ) pImp->GetShell()->InvalidateWindows( aRepaint ); - if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) ) + if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VclInputFlags::OTHER|VclInputFlags::PAINT ) ) return true; break; } @@ -1966,7 +1966,7 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) // #i122885# handle smarttag problems gracefully and provide diagnostics SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message); } - if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) ) + if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VclInputFlags::OTHER|VclInputFlags::PAINT ) ) return true; break; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 228bbee9089b..9c17966e9282 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3615,7 +3615,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( rRect.IsOver( aPaintRect ) ) { if ( bCnt && pFrm->IsCompletePaint() && - !rRect.IsInside( aPaintRect ) && Application::AnyInput( VCL_INPUT_KEYBOARD ) ) + !rRect.IsInside( aPaintRect ) && Application::AnyInput( VclInputFlags::KEYBOARD ) ) { //fix(8104): It may happen, that the processing wasn't complete //but some parts of the paragraph were still repainted. diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 27ec8a394605..580117f7c05d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -265,7 +265,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) aAction.SetComplete( false ); if ( mnLockPaint ) aAction.SetPaint( false ); - aAction.SetInputType( VCL_INPUT_KEYBOARD ); + aAction.SetInputType( VclInputFlags::KEYBOARD ); aAction.Action(); } |