diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-01 16:49:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 11:20:43 +0200 |
| commit | 8aa3cb98adb8675ff3f09d2c1da35d2423e57493 (patch) | |
| tree | 3e7f2df75f1176a64034be8c7de592dc92996054 /sc/source | |
| parent | fa52e2090651fc2b2f3ba77b8f0af196d705730f (diff) | |
fdo#84938: convert VCL_INPUT_ #defines to 'enum class'
Change-Id: I155e45f58974a2b946c4a7703b350bcbfbad342e
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/documen8.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/chartlis.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 7d7eca82fb36..42b5b958f0c2 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -454,7 +454,6 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress } #define CALCMAX 1000 // Berechnungen -#define ABORT_EVENTS (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER) namespace { @@ -683,6 +682,9 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers // Quit if either 1) its duration exceeds 50 ms, or 2) there is any // pending event after processing 32 cells. + VclInputFlags ABORT_EVENTS = VCL_INPUT_ANY; + ABORT_EVENTS &= ~VclInputFlags::TIMER; + ABORT_EVENTS &= ~VclInputFlags::OTHER; if ((50L < tools::Time::GetSystemTicks() - aScope.getStartTime()) || (nCount > 31 && Application::AnyInput(ABORT_EVENTS))) nCount = CALCMAX; } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 1d2ec693ba20..2bdb2b102c96 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -594,7 +594,7 @@ void ScChartListenerCollection::StartTimer() IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl) { - if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) + if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { aIdle.Start(); return 0; diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index bfb85ca4bf91..588075e76f04 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1916,7 +1916,7 @@ IMPL_LINK_NOARG(ScModule, IdleHandler) IMPL_LINK_NOARG(ScModule, SpellTimerHdl) { - if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) + if ( Application::AnyInput( VclInputFlags::KEYBOARD ) ) { aSpellIdle.Start(); return 0; // Later again ... |