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

[Caolán McNamara]

 sw/source/core/doc/tblrwcl.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ae93dac18ec099282676c1434fa95420c0451761
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 8 17:28:38 2014 +0000

    coverity#1242459 Identical code for different branches
    
    on the somewhat dubious logic of matching the otherwise
    near-identical duplicate logic later on
    
    Change-Id: Ic029cafbf2fa2a1fd3cf78464d58977f90bbc418

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 60cc5c8..ac310b4 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3770,8 +3770,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( bInsDel )
                 {
                     aParam1.bBigger = !aParam.bBigger;
-                    xFndBox.reset(::lcl_SaveInsDelData( aParam, ppUndo,
-                                                    aTmpLst, nDistStt));
+                    xFndBox.reset(::lcl_SaveInsDelData(aParam, ppUndo, aTmpLst, nDistStt));
                     if( ppUndo )
                         *ppUndo = aParam.CreateUndo(
                                         aParam.bBigger ? UNDO_TABLE_DELBOX
@@ -3781,7 +3780,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                 if( bInsDel
-                    ? ( TBLFIX_CHGABS == eTblChgMode ? bLeft : bLeft )
+                    ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
                     : ( TBLFIX_CHGABS != eTblChgMode && bLeft ) )
                 {
                     for( n = aLines.size(); n; )
@@ -3886,7 +3885,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( bInsDel )
                 {
                     aParam1.bBigger = !aParam.bBigger;
-                    xFndBox.reset(::lcl_SaveInsDelData( aParam, ppUndo, aTmpLst, nDistStt ));
+                    xFndBox.reset(::lcl_SaveInsDelData(aParam, ppUndo, aTmpLst, nDistStt));
                     if( ppUndo )
                         *ppUndo = aParam.CreateUndo(
                                         aParam.bBigger ? UNDO_TABLE_DELBOX