diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-07-27 20:29:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-27 22:08:06 +0200 |
| commit | e488c8d9eb85bd0d8d250f9839e11357418ebc84 (patch) | |
| tree | cf37d3e20376368c5c354c538799636f0e9b955c /sw | |
| parent | b1ad2ee35647ccd46b0bdb96c5ded09710e307be (diff) | |
sw: inline pointless RESCHEDULE macro
Change-Id: I093c8fbf5bb181d8e530fe33805a16aea94cdd62
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index db136d963873..9a5ea484770c 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -74,17 +74,12 @@ } \ } -#define RESCHEDULE \ - { \ - if ( IsReschedule() ) \ - { \ - ::RescheduleProgress( m_pImp->GetShell()->GetDoc()->GetDocShell() ); \ - } \ - } - void SwLayAction::CheckWaitCursor() { - RESCHEDULE + if (IsReschedule()) + { + ::RescheduleProgress(m_pImp->GetShell()->GetDoc()->GetDocShell()); + } if ( !m_pWait && IsWaitAllowed() && IsPaint() && ((std::clock() - m_nStartTicks) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) ) { @@ -1723,7 +1718,10 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) pContent = bNxtCnt ? pContentNext : pContent->GetNextContentFrame(); } - RESCHEDULE; + if (IsReschedule()) + { + ::RescheduleProgress(m_pImp->GetShell()->GetDoc()->GetDocShell()); + } } else { |