diff options
| -rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 9fa5d7e3132e..3eb533b8da22 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -696,33 +696,37 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) { if( bLeftOver && bRightOver) { - if ( bLeftOver ? bLeftValid : bVertValid ) - { - aBox.SetLine( bLeftOver ? pLeft : 0, - BOX_LINE_RIGHT ); - bVertValid ? nType |= 0x0020 : nType |= 0x0010; - } - if ( bRightOver ? bRightValid : bVertValid ) - { - aBox.SetLine( bRightOver ? pRight : pVert, - BOX_LINE_LEFT ); - bVertValid ? nType |= 0x0008 : nType |= 0x0004; - } + if ( bLeftValid ) + { + aBox.SetLine( pLeft, BOX_LINE_RIGHT ); + nType |= 0x0010; + } + if ( bRightValid ) + { + aBox.SetLine( pRight, BOX_LINE_LEFT ); + nType |= 0x0004; + } } else { - if ( bRightOver ? bLeftValid : bVertValid ) - { - aBox.SetLine( bRightOver ? pLeft : 0, - BOX_LINE_RIGHT ); - bVertValid ? nType |= 0x0020 : nType |= 0x0010; - } - if ( bLeftOver ? bRightValid : bVertValid ) + if ( bLeftValid ) + { + aBox.SetLine( bRightOver ? pLeft : 0, BOX_LINE_RIGHT ); + bVertValid ? nType |= 0x0020 : nType |= 0x0010; + } + if ( bLeftOver ) + { + if ( bRightValid ) { - aBox.SetLine( bLeftOver ? pRight : pVert, - BOX_LINE_LEFT ); - bVertValid ? nType |= 0x0008 : nType |= 0x0004; + aBox.SetLine( pRight, BOX_LINE_LEFT ); + nType |= 0x0004; } + } + else if ( bVertValid ) + { + aBox.SetLine( pVert, BOX_LINE_LEFT ); + nType |= 0x0008; + } } } else |