diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2021-07-28 15:03:21 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-07-28 21:57:05 +0200 |
| commit | 43d2b3bbacdd6bbe24149ed33c54a180d74c77e4 (patch) | |
| tree | 2641c1cdd38c693b01c0c55e7f8786ff6b847092 /sw | |
| parent | 0844bdd6b26af94350ee76803db8c95bc6118255 (diff) | |
Revert "tdf#58521 DOCX import: enable ContinuousEndnotes compat flag"
This reverts commit e35fc16969c0d0a55538733d76fc4bb03bf137b0.
Reason for revert: tdf#143456 shows there are layout problems with this compatibility option
Change-Id: I4f03b9a0cbc6de1d3dbf79681f7caa203a1ce59c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119451
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/layout/data/tdf58521_endnotes.docx | bin | 12541 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout2.cxx | 16 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/sw/qa/extras/layout/data/tdf58521_endnotes.docx b/sw/qa/extras/layout/data/tdf58521_endnotes.docx Binary files differdeleted file mode 100644 index f709a104c918..000000000000 --- a/sw/qa/extras/layout/data/tdf58521_endnotes.docx +++ /dev/null diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index a1c94ea2cb39..1db5f1e69214 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -1571,22 +1571,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testUserFieldTypeLanguage) "1,234.56"); } -CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf58521) -{ - // This is a testcase for the ContinuousEndnotes compat flag in docx. - // The document has 2 pages, the endnote anchor is on the first page. - // The endnote should be on the 2nd page together with the last page content. - createSwDoc(DATA_DIRECTORY, "tdf58521_endnotes.docx"); - xmlDocUniquePtr pXmlDoc = parseLayoutDump(); - - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 2 - // - Actual : 3 - // i.e. there was a separate endnote page - assertXPath(pXmlDoc, "/root/page", 2); - assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1); -} - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index f6d643f7af88..6f784e6174c1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -948,7 +948,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle, "tdf82173_endnoteStyle.docx" DECLARE_OOXMLEXPORT_TEST(testTdf55427_footnote2endnote, "tdf55427_footnote2endnote.odt") { - CPPUNIT_ASSERT_EQUAL(5, getPages()); + CPPUNIT_ASSERT_EQUAL(4, getPages()); uno::Reference<beans::XPropertySet> xPageStyle(getStyles("ParagraphStyles")->getByName("Footnote"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote style is rose color", sal_Int32(0xFF007F), getProperty< sal_Int32 >(xPageStyle, "CharColor") ); xPageStyle.set(getStyles("ParagraphStyles")->getByName("Endnote"), uno::UNO_QUERY); |