From 7799ceab2639f1e3bcd35c6cf7e7b064bb1b6e9a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 31 Oct 2012 11:35:40 +0100 Subject: n#785767 import NS_ooxml::LN_CT_TrPrBase_gridAfter Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd --- writerfilter/source/dmapper/DomainMapperTableManager.cxx | 8 +++++++- writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 0416b1ddd86a..bab4bd51bf20 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -44,6 +44,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), @@ -309,6 +310,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) } } break; + case NS_ooxml::LN_CT_TrPrBase_gridAfter: + m_nGridAfter = nIntValue; + break; default: bRet = false; @@ -452,7 +456,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(); @@ -521,6 +525,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 daba8cec62af..84ca620c4c0e 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -37,6 +37,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 -- cgit