diff options
| author | László Németh <nemeth@numbertext.org> | 2019-10-16 10:16:46 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-10-16 11:44:09 +0200 |
| commit | 350972a8bffc1a74b531e0336954bf54b1356025 (patch) | |
| tree | 4cfc8adf3d8f01e0428b3b3524aad2fad0fd29c7 /sw | |
| parent | ccdb68fd5893f106609eacf71023d2269a682085 (diff) | |
tdf#128156 DOCX import: fix losing redline at page break
w:framePr of page header doesn't mean real frame conversion,
so don't store and lose redlines after it.
Regression from commit e8bae67b3dbcc90ace8264b6b1aefaf0ce459aba
"tdf#125894: DOCX: import tracked changes in frames".
Change-Id: I46cd153cccef4824deca1f64341f2ea6672cdc42
Reviewed-on: https://gerrit.libreoffice.org/80871
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf128156.docx | bin | 0 -> 42256 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128156.docx b/sw/qa/extras/ooxmlexport/data/tdf128156.docx Binary files differnew file mode 100644 index 000000000000..b499f6e50bdc --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf128156.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 2f1207098c9b..807dd7b79708 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -908,6 +908,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894, "tdf125894.docx") assertXPath(pXmlDoc, "//w:ins"); } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + // import change tracking in frames + assertXPath(pXmlDoc, "//w:ins"); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125546, "tdf125546.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |