summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-08 17:28:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-08 21:23:42 +0000
commitae93dac18ec099282676c1434fa95420c0451761 (patch)
tree98828e6187bc1cd2cbcbba97ae7b452e417ea2c2 /sw
parent72406d531c84d40a711bb4fbd0de1bc9e03d9ea4 (diff)
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
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/tblrwcl.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 60cc5c800673..ac310b4652fe 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