diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 09:25:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 10:27:12 +0200 |
| commit | 2c56d461633ff1a1b364685df79b521f8802c4ec (patch) | |
| tree | b419b70f891398d39decdc17b7e4f5ae82d478fa /sw/source/core/layout/calcmove.cxx | |
| parent | a975225678c00272fc6e2ee2c85e6fe00a2204f1 (diff) | |
clang-tidy readability-simplify-boolean-expr in sw
Change-Id: Ib3ec37b8280c527fa712192db043b348c3427c50
Reviewed-on: https://gerrit.libreoffice.org/36877
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 65fab03a33c8..6d9721748cb5 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1687,15 +1687,8 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) // for MoveBwd. Robust: We also check the bMovedBwd flag again. // If pOldUp was a footnote frame, it has been deleted inside MoveFwd. // Therefore we only check for growing body frames. - if ( bCheckForGrownBody && ! bMovedBwd && pOldUp != GetUpper() && - aRectFnSet.GetHeight(pOldUp->Frame()) > nOldBodyHeight ) - { - bMovedFwd = false; - } - else - { - bMovedFwd = true; - } + bMovedFwd = !bCheckForGrownBody || bMovedBwd || pOldUp == GetUpper() || + aRectFnSet.GetHeight(pOldUp->Frame()) <= nOldBodyHeight; bFormatted = false; if ( bMoveOrFit && GetUpper() == pOldUp ) |