diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-15 15:08:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-15 15:24:05 +0200 |
| commit | 00e0ce3f79bb90836402ca6285867b8e02d2497b (patch) | |
| tree | 45ba6b2014e38817255d9dccc14f1d88730e9933 /sw | |
| parent | b4f35a7450830979b937ec6ae3b6d638302093d2 (diff) | |
sw: use same condition in other cases in SwLayIdle::_DoIdleJob()
The difference is VclInputFlags::APPEVENT, which is a Mac OSX specific
mystery that presumably indicates user input.
Change-Id: Icd0e3aa273e1a16e9bf0fb678e9e51dd37e159b7
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 195aa32656f3..e40e31e94b6d 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1922,7 +1922,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob ) bAllValid = false; if ( aRepaint.HasArea() ) pImp->GetShell()->InvalidateWindows( aRepaint ); - if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VclInputFlags::OTHER|VclInputFlags::PAINT ) ) + if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER))) return true; break; } @@ -1955,7 +1955,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *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|VclInputFlags::OTHER|VclInputFlags::PAINT ) ) + if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER))) return true; break; } |