diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-22 10:42:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-22 11:07:21 +0200 |
| commit | ce5dd8647083c944fb298c491fb526dad17a8a1a (patch) | |
| tree | 55771d1ddadc5e9f86c4f97c274d64b42ba82c0d /sw/qa | |
| parent | b9f187055394713fbc58d149c6ea98fe13dbadd5 (diff) | |
DOCX import: ignore SDT as well in to-be-discarded header/footer
Change-Id: I53388e8b8ca71a3ad5d0b3e22dd60c642cb1f4b7
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/sdt-ignored-footer.docx | bin | 0 -> 18299 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/sdt-ignored-footer.docx b/sw/qa/extras/ooxmlexport/data/sdt-ignored-footer.docx Binary files differnew file mode 100644 index 000000000000..8330291af869 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/sdt-ignored-footer.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 953a036249ea..0bb68e87d66c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -242,6 +242,15 @@ DECLARE_OOXMLEXPORT_TEST(testTableAlignment, "table-alignment.docx") CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::RIGHT, getProperty<sal_Int16>(xTable, "HoriOrient")); } +DECLARE_OOXMLEXPORT_TEST(testSdtIgnoredFooter, "sdt-ignored-footer.docx") +{ + if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) + { + // This was 1, make sure no w:sdt sneaks into the main document from the footer. + assertXPath(pXmlDoc, "//w:sdt", 0); + } +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |