diff options
| author | László Németh <nemeth@numbertext.org> | 2020-09-14 11:00:27 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-15 08:16:31 +0200 |
| commit | 464a7b0631335a8f8729512b8c27f864747f56a7 (patch) | |
| tree | 975336153f37de36adb4248b8097cff1d7162015 /sw/qa/extras | |
| parent | 0e27b1f364d9b36cb5f8431d9df36b5953237424 (diff) | |
tdf#136667 DOCX import: fix crash of floating tables
with tracked changes of table structure (not only cell
text content), where text ranges of redlines aren't
connected to a cell. Support also different table names
of redline text ranges for sure.
Regression from commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9
(tdf#132271 DOCX: import change tracking in floating tables).
Change-Id: I58b1b21c8016d682a292409165991dec2f8cfa3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102655
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf136667.docx | bin | 0 -> 12729 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf136667.docx b/sw/qa/extras/ooxmlexport/data/tdf136667.docx Binary files differnew file mode 100644 index 000000000000..e5b047ee3330 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf136667.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 6cdecfd2c258..cd00389f063c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -979,6 +979,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132271, "tdf132271.docx") assertXPath(pXmlDoc, "//w:ins", 2); } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf136667, "tdf136667.docx") +{ + xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); + // import change tracking in floating tables + assertXPath(pXmlDoc, "//w:del", 2); + assertXPath(pXmlDoc, "//w:ins", 4); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx") { xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); |