[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Xisco Fauli (via logerrit)]

 dev/null                                    |binary
 sw/qa/extras/layout/layout2.cxx             |   16 ----------------
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |    2 +-
 writerfilter/source/filter/WriterFilter.cxx |    1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit eeda1b35a6e87d5349545464da33d997c52f15e3
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Aug 9 18:16:33 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Aug 10 15:30:31 2021 +0200

    Revert "tdf#58521 DOCX import: enable ContinuousEndnotes compat flag"
    
    This reverts commit f9982c24066d6dd2f938cc20176af0f196bc018f.
    
    Reason for revert: tdf#143456 shows there are layout problems with this compatibility option
    
    This was reverted in libreoffice-7-2 branch only. See 43d2b3bbacdd6bbe24149ed33c54a180d74c77e4.
    Instead, this should have been reverted in master first, and the
    cherry-pick the revert to libreoffice-7-2
    
    Change-Id: I3a29b77289ef1445fdf4886b32861f6d8e79de21
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120150
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/extras/layout/data/tdf58521_endnotes.docx b/sw/qa/extras/layout/data/tdf58521_endnotes.docx
deleted file mode 100644
index f709a104c918..000000000000
Binary files a/sw/qa/extras/layout/data/tdf58521_endnotes.docx and /dev/null differ
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);
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 68280eadb287..0d9326c41fe0 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -332,7 +332,6 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo
     xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", uno::makeAny(true));
     xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::makeAny(true));
     xSettings->setPropertyValue("DisableOffPagePositioning", uno::makeAny(true));
-    xSettings->setPropertyValue("ContinuousEndnotes", uno::makeAny(true));
 }
 
 void WriterFilter::setSourceDocument(const uno::Reference<lang::XComponent>& xDoc)