From 4b4cd502806cfc9c9cc9754b8aae18a2c2632cdc Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 18 Jul 2017 23:02:32 +0300 Subject: tdf#108849: allow out-of-order sectPr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to ISO/IEC 29500-1:2016(E) 17.6.17), the final must be the last child element of the body element. Also, this is enforced in schema for CT_Body complex type (Annex A. (normative) Schemas – W3C XML Schema, A.1 WordprocessingML, page 3866), where sectPr is a part of , and thus *must* stay at specific place in sequence, namely being the last element, and be at most one instance. However, real-life documents (generated by some third-party software) have sectPr before other body contents. Unfortunately, MS Word seems to allow this standards-violating content, and thus encourages creation of non-standard documents by third-party generators. This patch doesn't assume that current final (body-level) sectPr is the last body element, and does not mark current paragraph as last section's paragraph. Thus, current section (possibly started after previous paragraph-level sectPr) is continued after final sectPr is closed. Change-Id: I8e88288bc6659d77d17986514b3b4fe16a5b45d9 Reviewed-on: https://gerrit.libreoffice.org/40161 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- sw/qa/extras/ooxmlimport/data/tdf108849.docx | Bin 0 -> 1360 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf108849.docx (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/data/tdf108849.docx b/sw/qa/extras/ooxmlimport/data/tdf108849.docx new file mode 100644 index 000000000000..6f3664374cd8 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf108849.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 7cbeb5cf3e68..384e0e09a053 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1397,6 +1397,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") CPPUNIT_ASSERT_EQUAL(getPages(), 2); } +DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx") +{ + // sectPr element that is child element of body must be the last child. Hovewer, Word accepts it + // in wrong places, and we should do the same (bug-to-bug compatibility) without creating extra sections. + CPPUNIT_ASSERT_EQUAL(2, getParagraphs()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Misplaced body-level sectPr's create extra sections!", 2, getPages()); +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); -- cgit