summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-10-09 23:39:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-10 06:47:08 +0000
commitfa2cb837647e659dd1d3438c4513d088ed9097c1 (patch)
treeb6a6741abb9078bad531a61989cb32423c62c75c /sw/source/core
parent7060c7b642fdc0a369505e430652ee44205e7eed (diff)
cppcheck: clarifyCondition
Change-Id: I4dfcaec8764699cc1dfd725b9cd1100750ee3d0f Reviewed-on: https://gerrit.libreoffice.org/29629 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/doc/tblrwcl.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 6652bcaa6380..de3a79186a9f 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2384,8 +2384,11 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return false;
// Collect all "ContentBoxes"
- if( (bGreaterBox = TBLFIX_CHGABS != rParam.nMode && ( nDist + ( rParam.bLeft ? 0 : nWidth ) ) >= rParam.nSide) ||
- ( !rParam.bBigger && ( std::abs( nDist + (( rParam.nMode && rParam.bLeft ) ? 0 : nWidth ) - rParam.nSide ) < COLFUZZY ) ) )
+ bGreaterBox = (TBLFIX_CHGABS != rParam.nMode)
+ && ((nDist + (rParam.bLeft ? 0 : nWidth)) >= rParam.nSide);
+ if (bGreaterBox
+ || (!rParam.bBigger
+ && (std::abs(nDist + ((rParam.nMode && rParam.bLeft) ? 0 : nWidth) - rParam.nSide) < COLFUZZY)))
{
rParam.bAnyBoxFnd = true;
SwTwips nLowerDiff;