diff options
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index ea9f7a15c144..62d70bba60b3 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_nGridBefore(0), m_nGridAfter(0), m_nCellBorderIndex(0), m_nHeaderRepeat(0), @@ -319,6 +320,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) } } break; + case NS_ooxml::LN_CT_TrPrBase_gridBefore: + m_nGridBefore = nIntValue; + break; case NS_ooxml::LN_CT_TrPrBase_gridAfter: m_nGridAfter = nIntValue; break; @@ -465,12 +469,12 @@ 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_nGridAfter ) && m_nCell.back( ) > 0 ) + if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 ) { uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell.back( ) - 1 ); text::TableColumnSeparator* pSeparators = aSeparators.getArray(); sal_Int16 nLastRelPos = 0; - sal_uInt32 nBorderGridIndex = 0; + sal_uInt32 nBorderGridIndex = m_nGridBefore; ::std::vector< sal_Int32 >::const_iterator aSpansIter = pCurrentSpans->begin( ); for( sal_uInt32 nBorder = 0; nBorder < m_nCell.back( ) - 1; ++nBorder ) @@ -534,7 +538,7 @@ void DomainMapperTableManager::endOfRowAction() m_nCellBorderIndex = 0; pCurrentSpans->clear(); - m_nGridAfter = 0; + m_nGridBefore = m_nGridAfter = 0; #ifdef DEBUG_DOMAINMAPPER dmapper_logger->endElement(); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index ab6abb3e2d36..2c346fb9a86b 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_nGridBefore; ///< number of grid columns in the parent table's table grid which must be skipped before the contents of this table row are added to the parent table 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 |