diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-08 17:01:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 07:35:43 +0100 |
| commit | f14b9d30293f180500fc56d81e5390021758e7c1 (patch) | |
| tree | a6cd0b853169203cfa0953230e6774e7b1dd81b4 /sw/source/core/layout/wsfrm.cxx | |
| parent | d11120b95ee27cb4b05db466ed07f7a996dda125 (diff) | |
convert (a>b?a:b) to std::max(a,b)
with something like:
git grep -nP '(.*)\s*>\s*(.*)\s*\?\s*\g1\s*:\s*\g2'
Change-Id: I60b9a3a2a09162bc0de4c13fdde2c209696e5413
Reviewed-on: https://gerrit.libreoffice.org/47602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index f36667e96554..04a798c029b0 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2110,7 +2110,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) if( GetUpper() ) { if( bTst || !GetUpper()->IsFooterFrame() ) - nReal = GetUpper()->Grow( nDist - (nReal > 0 ? nReal : 0), + nReal = GetUpper()->Grow( nDist - std::max<long>(nReal, 0), bTst, bInfo ); else { |