[Libreoffice-commits] core.git: sw/source

[Jochen Nitschke]

 sw/source/core/doc/tblrwcl.cxx    |    7 +++++--
 sw/source/uibase/docvw/edtwin.cxx |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit fa2cb837647e659dd1d3438c4513d088ed9097c1
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Oct 9 23:39:43 2016 +0200

    cppcheck: clarifyCondition
    
    Change-Id: I4dfcaec8764699cc1dfd725b9cd1100750ee3d0f
    Reviewed-on: https://gerrit.libreoffice.org/29629
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 6652bca..de3a791 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 a79423a..d39c6d9 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;