diff options
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index f5129f1a87a6..ea9f7a15c144 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -53,6 +53,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, bool bImplicitMe m_nRow(0), m_nCell(), m_nGridSpan(1), + m_nGridAfter(0), m_nCellBorderIndex(0), m_nHeaderRepeat(0), m_nTableWidth(0), @@ -318,6 +319,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) } } break; + case NS_ooxml::LN_CT_TrPrBase_gridAfter: + m_nGridAfter = nIntValue; + break; default: bRet = false; @@ -461,7 +465,7 @@ void DomainMapperTableManager::endOfRowAction() double nFullWidth = m_nTableWidth; //the positions have to be distibuted in a range of 10000 const double nFullWidthRelative = 10000.; - if( pTableGrid->size() == nGrids && m_nCell.back( ) > 0 ) + if( pTableGrid->size() == ( nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 ) { uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell.back( ) - 1 ); text::TableColumnSeparator* pSeparators = aSeparators.getArray(); @@ -530,6 +534,8 @@ void DomainMapperTableManager::endOfRowAction() m_nCellBorderIndex = 0; pCurrentSpans->clear(); + m_nGridAfter = 0; + #ifdef DEBUG_DOMAINMAPPER dmapper_logger->endElement(); #endif diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 0435cb9cf994..ab6abb3e2d36 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -46,6 +46,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t sal_uInt32 m_nRow; ::std::vector< sal_uInt32 > m_nCell; sal_uInt32 m_nGridSpan; + sal_uInt32 m_nGridAfter; ///< number of grid columns in the parent table's table grid which shall be left after the last cell in the table row sal_uInt32 m_nCellBorderIndex; //borders are provided for all cells and need counting sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1 then the repeating stops sal_Int32 m_nTableWidth; //might be set directly or has to be calculated from the column positions |