[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source

[karth]

 svx/source/table/viewcontactoftableobj.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d87160b888fe476d179982cbb297cf0e70632f3a
Author: karth <karthikeyan at kacst.edu.sa>
Date:   Thu Jan 24 05:49:50 2013 +0530

    Resolves the bug fdo#59117 missing borders of last column
    
      When writingmode is set to RTL, the table is start drawn from Last column
    to first column.  There is no problem with left&right lines, Because these
    are not depends on the LTR or RTL writingmode.  But the bottom & top line
    depends on writing mode.  As these two lines are drawn from previous cell to
    next cell(left to right) the nX value should be nX-1 in RTL writingmode.
    
    Change-Id: I3e21c7dd469ed5ba29e66f79da471b662632182e
    Reviewed-on: https://gerrit.libreoffice.org/1834
    Reviewed-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    Tested-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    (cherry picked from commit 8c200d85cdbece5c65b35211644f1e98491f307a)
    
    Signed-off-by: Lior Kaplan <kaplanlior at gmail.com>

diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index a74dc60..1f9f7d2 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -357,7 +357,7 @@ namespace drawinglayer
                 }
             }
 
-            if(!getRightLine().isEmpty() && getRightIsOutside())
+            if(!getRightLine().isEmpty())
             {
                 // create right line from top to bottom
                 const basegfx::B2DPoint aStart(getTransform() * basegfx::B2DPoint(1.0, 0.0));
@@ -622,9 +622,11 @@ namespace sdr
 
                                     // get basic lines
                                     impGetLine(aLeftLine, rTableLayouter, nX, nY, false, nColCount, nRowCount, bIsRTL);
-                                    impGetLine(aBottomLine, rTableLayouter, nX, nYBottom, true, nColCount, nRowCount, bIsRTL);
+                                    //To resolve the bug fdo#59117
+                                    //In RTL table as BottomLine & TopLine are drawn from Left Side to Right, nX should be nX-1
+                                    impGetLine(aBottomLine, rTableLayouter, bIsRTL?nX-1:nX, nYBottom, true, nColCount, nRowCount, bIsRTL);
                                     impGetLine(aRightLine, rTableLayouter, nXRight, nY, false, nColCount, nRowCount, bIsRTL);
-                                    impGetLine(aTopLine, rTableLayouter, nX, nY, true, nColCount, nRowCount, bIsRTL);
+                                    impGetLine(aTopLine, rTableLayouter, bIsRTL?nX-1:nX, nY, true, nColCount, nRowCount, bIsRTL);
 
                                     // get the neighbor cells' borders
                                     impGetLine(aLeftFromTLine, rTableLayouter, nX, nY - 1, false, nColCount, nRowCount, bIsRTL);