[PATCH] more fix to fdo#62470

[Faisal al-otaibi (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3305

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/3305/1

more fix to fdo#62470

fix some problem appear when delete the right border.

Change-Id: I2bd1d69142bb0a920bdb58c833f8cbbb461a8350
---
M sw/source/core/docnode/ndtbl1.cxx
1 file changed, 26 insertions(+), 22 deletions(-)



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 @@
                 {
                         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 )
+                            if ( bLeftValid )
+                            {
+                                aBox.SetLine( bRightOver ? pLeft : 0, BOX_LINE_RIGHT );
+                                bVertValid ? nType |= 0x0020 : nType |= 0x0010;
+                            }
+                            if ( bLeftOver )
+                            {
+                                if ( bRightValid )
                                 {
-                                    aBox.SetLine( bRightOver ? pLeft : 0,
-                                                  BOX_LINE_RIGHT );
-                                    bVertValid ? nType |= 0x0020 : nType |= 0x0010;
+                                    aBox.SetLine( pRight, BOX_LINE_LEFT );
+                                    nType |= 0x0004;
                                 }
-                                if ( bLeftOver ? bRightValid : bVertValid )
-                                {
-                                    aBox.SetLine( bLeftOver ? pRight : pVert,
-                                                  BOX_LINE_LEFT );
-                                    bVertValid ? nType |= 0x0008 : nType |= 0x0004;
-                                }
+                            }
+                            else if ( bVertValid )
+                            {
+                                aBox.SetLine( pVert, BOX_LINE_LEFT );
+                                nType |= 0x0008;
+                            }
                         }
                 }
                 else

-- 
To view, visit https://gerrit.libreoffice.org/3305
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bd1d69142bb0a920bdb58c833f8cbbb461a8350
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi <fmalotaibi at kacst.edu.sa>