[PATCH] fdo#42387 Fixed Merging of cells in RTL Tables in impress

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1686

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1686/1

fdo#42387 Fixed Merging of cells in RTL Tables in impress

The problem was in calculating the cell area, the width should be
subtracted to Right end of cell instead it was adding width to Left
end of the origin cell

Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3
---
M svx/source/table/tablelayouter.cxx
1 file changed, 12 insertions(+), 2 deletions(-)



diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index eecf16d..27bf185 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -128,13 +128,23 @@
         if( xCell.is() && !xCell->isMerged() && isValid(rPos) )
         {
             const basegfx::B2ITuple aCellSize( getCellSize( rPos ) );
+            const bool bRTL = meWritingMode == WritingMode_RL_TB;
 
             if( (rPos.mnCol < ((sal_Int32)maColumns.size()) && (rPos.mnRow < 
((sal_Int32)maRows.size()) ) ) )
             {
-                const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
                 const sal_Int32 y = maRows[rPos.mnRow].mnPos;
 
-                rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(), y + aCellSize.getY()  );
+                if(bRTL)
+                {
+                    ///For RTL Table Calculate the Right End of cell instead of Left
+                    const sal_Int32 x = maColumns[rPos.mnCol].mnPos + maColumns[rPos.mnCol].mnSize;
+                    rArea = basegfx::B2IRectangle( x-aCellSize.getX(), y, x, y + aCellSize.getY()  
);
+                }
+                else
+                {
+                    const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
+                    rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(), y + 
aCellSize.getY()  );
+                }
                 return true;
             }
         }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s <gswaminathan@kacst.edu.sa>