sw/qa/extras/ooxmlexport/data/tdf131258.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 7 +++++++ writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit 34f91740cde8e77bd429f468ce0d797d8b0c2af4 Author: László Németh <nem...@numbertext.org> AuthorDate: Wed Mar 11 18:58:59 2020 +0100 Commit: László Németh <nem...@numbertext.org> CommitDate: Thu Mar 12 08:23:57 2020 +0100 tdf#131258 DOCX: fix table styles in empty tables Pending paragraphs were disposed before table processing, so empty tables have left out of the rewritten table style preference handling, resulting for example different cell heights. Regression from commit 4d5c0eaf3e0d3d3bcd9e691fffee19b75f3d6631 (tdf#118812 DOCX import: fix table style preference – part 2). Change-Id: I5d5d29f37c8198484e24519ced5a50458c923064 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90347 Tested-by: Jenkins Tested-by: László Németh <nem...@numbertext.org> Reviewed-by: László Németh <nem...@numbertext.org> diff --git a/sw/qa/extras/ooxmlexport/data/tdf131258.docx b/sw/qa/extras/ooxmlexport/data/tdf131258.docx new file mode 100644 index 000000000000..10b8f9de21d8 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf131258.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 3b5726dceb28..cbaa68ff0d0e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -466,6 +466,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf119054, "tdf119054.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "line", "240"); } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131258, "tdf131258.docx") +{ + xmlDocPtr pXmlDoc = parseExport(); + // Use table style based bottom margin instead of the docDefaults in empty tables, too + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "after", "0"); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo69636, "fdo69636.docx") { /* diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 3cc394b8a50d..37ff993f3b41 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -1400,7 +1400,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab m_aCellProperties.clear(); m_aRowProperties.clear(); m_bHadFootOrEndnote = false; - if (nestedTableLevel <= 1) + if (nestedTableLevel <= 1 && m_rDMapper_Impl.m_bConvertedTable) m_rDMapper_Impl.m_aParagraphsToEndTable.clear(); #ifdef DBG_UTIL _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits