sw/source/core/docnode/ndtbl1.cxx | 48 ++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 22 deletions(-)
New commits:
commit 327adac44129264f7bc0dab161afbb88ec3003d8
Author: Faisal M. Al-Otaibi <fmalota...@kacst.edu.sa>
Date: Wed Apr 10 12:50:30 2013 +0300
more fix to fdo#62470
fix some problem appear when delete the right border.
Change-Id: I2bd1d69142bb0a920bdb58c833f8cbbb461a8350
Reviewed-on: https://gerrit.libreoffice.org/3305
Reviewed-by: Ahmad Harthi <aalhar...@kacst.edu.sa>
Tested-by: Ahmad Harthi <aalhar...@kacst.edu.sa>
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 9fa5d7e..3eb533b 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
