summaryrefslogtreecommitdiffstats
path: root/sw/qa/extras
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-06-18 14:09:56 +1000
committerMike Kaganski <mike.kaganski@collabora.com>2018-07-03 18:58:26 +0200
commit336d052a8db24ec9d19cec47c54ff76ed35a413c (patch)
treea1f844e43127996006991dabf0b4241a75e5b094 /sw/qa/extras
parenttdf#102195: don't exclude everything between first and last subset (diff)
downloadcore-336d052a8db24ec9d19cec47c54ff76ed35a413c.tar.gz
core-336d052a8db24ec9d19cec47c54ff76ed35a413c.zip
tdf#107969: use proper serializer for VML in footnotes/endnotes
Change-Id: Ie0e062fab0ae1a63094655cc0f6bee958b4c1087 Reviewed-on: https://gerrit.libreoffice.org/55978 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c67b7d795589aaf8f3396a379ef348bd650cb2dc) Reviewed-on: https://gerrit.libreoffice.org/56754
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf107969.docxbin0 -> 28622 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf107969.docx b/sw/qa/extras/ooxmlexport/data/tdf107969.docx
new file mode 100644
index 000000000000..e674bcb5db72
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf107969.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index eb42cee254a2..e086b1998aa7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -381,6 +381,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx")
CPPUNIT_ASSERT_EQUAL(OUString("D1"), xCell->getString());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx")
+{
+ // A VML object in a footnote's tracked changes caused write past end of document.xml at export to docx.
+ // After that, importing after export failed with
+ // SAXParseException: '[word/document.xml line 2]: Extra content at the end of the document', Stream 'word/document.xml'.
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */