summaryrefslogtreecommitdiff
path: root/svx/source/table/tablelayouter.cxx
diff options
context:
space:
mode:
authorGokul <gswaminathan@kacst.edu.sa>2013-01-15 11:41:53 +0300
committerNoel Power <noel.power@suse.com>2013-01-16 10:34:21 +0000
commitbd20b86ee762d4a14766a755d44efdeb50cef7e7 (patch)
treeb7f60f2b3e9e7a0973cf7dfe353e2e20af8d48a2 /svx/source/table/tablelayouter.cxx
parent47a95b1f165169034402f9df0179776c4001e415 (diff)
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 Reviewed-on: https://gerrit.libreoffice.org/1686 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'svx/source/table/tablelayouter.cxx')
-rw-r--r--svx/source/table/tablelayouter.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index eecf16d80bf3..27bf185be7f0 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -128,13 +128,23 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr
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;
}
}