diff options
| author | László Németh <nemeth@numbertext.org> | 2020-07-01 18:14:39 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-07-02 23:45:21 +0200 |
| commit | aea7fe41358c218a12dc34e4c0942360f0d5fde6 (patch) | |
| tree | c4caada59fdf566f95dba8e6594452d671474d8c /writerfilter | |
| parent | 1c34bb0e2d38196df609d5f3803c6df1672986a5 (diff) | |
tdf#133735 DOCX: fix paragraph settings of nested tables
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 <nemeth@numbertext.org>
(cherry picked from commit 8b5be44b30119b67d7b3ca9c4140046976a1df59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97790
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 915b317d40d5..a19b9395e192 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) ) |