diff options
| author | László Németh <nemeth@numbertext.org> | 2020-02-07 15:06:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-05-18 16:59:30 +0200 |
| commit | 43c52057ae9d0a620611a3fcc484762dd06f47f5 (patch) | |
| tree | 86aca1a447457c9d3ada32eb47aa1bd92dedd5a0 /sw | |
| parent | 2b525eef03c7708bba9734ecbb543c8bf7e7aa3b (diff) | |
tdf#130494: DOCX import: limit paragraph-level character property
expansion for the whole table paragraph based on the
last character context.
regression from 2ab481b038b62b1ff576ac4d49d03c1798cd7f84
(tdf#90069 DOCX: fix character style of new table rows)
(cherry picked from commit abb9c7db8bcc06f907d39a7811711882161d5803)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I49da23c268436488ff1537771869c38108113c12
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf130494.docx | bin | 0 -> 17455 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf130494.docx b/sw/qa/extras/ooxmlexport/data/tdf130494.docx Binary files differnew file mode 100644 index 000000000000..bc2050feaa55 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf130494.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 1833988a0b84..4e29e1bce375 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -515,6 +515,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf126723, "tdf126723.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(getParagraph(2), "ParaLeftMargin")); } +DECLARE_OOXMLEXPORT_TEST(testTdf130494, "tdf130494.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + { + return; + } + + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:highlight", "val", "yellow"); + // keep direct formatting of table cell paragraph with removed highlighting + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r/w:rPr/w:highlight", 0); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |