diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-10-09 23:39:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-10 06:47:08 +0000 |
| commit | fa2cb837647e659dd1d3438c4513d088ed9097c1 (patch) | |
| tree | b6a6741abb9078bad531a61989cb32423c62c75c /sw/source | |
| parent | 7060c7b642fdc0a369505e430652ee44205e7eed (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')
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 2 |
2 files changed, 6 insertions, 3 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; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a79423a7f323..d39c6d9f35a0 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -453,7 +453,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) PointerStyle eStyle = PointerStyle::Text; if ( !pSdrView ) bCntAtPos = true; - else if ( (bHitHandle = pSdrView->PickHandle( rLPt ) != nullptr) ) + else if ( (bHitHandle = (pSdrView->PickHandle(rLPt) != nullptr)) ) { m_aActHitType = SdrHitKind::Object; bPrefSdrPointer = true; |