sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 11 +++++++++++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 3 +++
2 files changed, 14 insertions(+)
New commits:
commit 36a59940c121ab648fae7d4f05a851eeb517a5eb
Author: László Németh <nem...@numbertext.org>
AuthorDate: Wed Jul 1 18:14:39 2020 +0200
Commit: Gabor Kelemen <kelemen.gab...@nisz.hu>
CommitDate: Tue Jul 28 13:53:25 2020 +0200
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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97645
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 8b5be44b30119b67d7b3ca9c4140046976a1df59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97790
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
(cherry picked from commit aea7fe41358c218a12dc34e4c0942360f0d5fde6)
Change-Id: I17d81d0906f424fe35237ac285e8ad27090bcab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99590
Tested-by: Gabor Kelemen <kelemen.gab...@nisz.hu>
Reviewed-by: Gabor Kelemen <kelemen.gab...@nisz.hu>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index a5f3ae30e3eb..90d9c2129bef 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -383,6 +383,17 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133735, "fdo73389.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport();
+
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[2]/w:tc[1]/w:p/w:pPr/w:spacing",
"after", "0");
+ // This was 200
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing",
"after", "0");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:spacing",
"after", "0");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[3]/w:p/w:pPr/w:spacing",
"after", "0");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
{
// Table with "auto" table width and incomplete grid: 11 columns, but only
4 gridCol elements.
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0b60c823b9d0..910020366888 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -566,6 +566,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
@@ -584,6 +585,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 );
}
// Push the tmp position now that we compared it
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
