From 45504ca72e0f081de9e7cc4f1faf553c7361694d Mon Sep 17 00:00:00 2001 From: László Németh Date: Wed, 1 Jul 2020 18:14:39 +0200 Subject: tdf#133735 DOCX: fix paragraph settings of nested tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First row of a nested tables lost its paragraph settings, by dropping the collected paragraph data of the unfinished row. Regression from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c (tdf#132514 DOCX import: fix lost table style with footer) Change-Id: I17d81d0906f424fe35237ac285e8ad27090bcab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97645 Tested-by: Jenkins Reviewed-by: László Németh --- writerfilter/source/dmapper/DomainMapperTableManager.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'writerfilter/source/dmapper/DomainMapperTableManager.cxx') diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index d0f46d312128..2d75c971b85a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -580,6 +580,7 @@ void DomainMapperTableManager::endOfRowAction() IntVectorPtr pTmpCellWidths = m_aCellWidths.back(); sal_uInt32 nTmpCell = m_nCell.back(); sal_uInt32 nTmpGridBefore = m_aGridBefore.back(); + TableParagraphVectorPtr pTableParagraphs = getCurrentParagraphs(); // endLevel and startLevel are taking care of the non finished row // to carry it over to the next table @@ -598,6 +599,8 @@ void DomainMapperTableManager::endOfRowAction() m_aCellWidths.push_back(pTmpCellWidths); m_nCell.push_back(nTmpCell); m_aGridBefore.push_back(nTmpGridBefore); + m_aParagraphsToEndTable.pop( ); + m_aParagraphsToEndTable.push( pTableParagraphs ); } // save table style in the first row for comparison if ( m_nRow == 0 && pTablePropMap->isSet(META_PROP_TABLE_STYLE_NAME) ) -- cgit v1.2.3