diff options
| author | Mark Hung <marklh9@gmail.com> | 2016-06-02 01:45:55 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2016-06-30 14:55:41 +0000 |
| commit | 0381026924947c6164d1eebe7395c91f619965ce (patch) | |
| tree | e54b75bc17a9f08d284cdc721e049745a1fb8698 /oox | |
| parent | 5ee7caad68fecfb2124dd90e077597e92b6400c9 (diff) | |
tdf#100179 correct cell merging in pptx.
Change-Id: I7a5bc6fb33c64d1ff398986eff5b960fe037df4d
Reviewed-on: https://gerrit.libreoffice.org/25791
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index e389fc6db416..8d63d2cdfb06 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1321,7 +1321,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape ) // having : horizontal merge mpFS->startElementNS(XML_a, XML_tc, XML_gridSpan, I32S(xCell->getColumnSpan()), FSEND); - for(sal_Int32 columnIndex = nColumn; columnIndex < xCell->getColumnSpan(); ++columnIndex) { + for(sal_Int32 columnIndex = nColumn; columnIndex < nColumn + xCell->getColumnSpan(); ++columnIndex) { sal_Int32 transposeIndexForMergeCell = (nRow*nColumnCount) + columnIndex; mergedCellMap[transposeIndexForMergeCell] = std::make_pair(transposedIndexofCell, xCell); @@ -1333,7 +1333,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape ) mpFS->startElementNS(XML_a, XML_tc, XML_rowSpan, I32S(xCell->getRowSpan()), FSEND); - for(sal_Int32 rowIndex = nRow; rowIndex < xCell->getRowSpan(); ++rowIndex) { + for(sal_Int32 rowIndex = nRow; rowIndex < nRow + xCell->getRowSpan(); ++rowIndex) { sal_Int32 transposeIndexForMergeCell = (rowIndex*nColumnCount) + nColumn; mergedCellMap[transposeIndexForMergeCell] = std::make_pair(transposedIndexofCell, xCell); |