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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/layout/data/tdf145826.odt |binary
 sw/qa/extras/layout/layout.cxx         |   17 +++++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 26f976aad49683f18e62219a2b5c0efcb38090d4
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Nov 30 19:36:26 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Dec 1 09:19:19 2021 +0100

    tdf#145826: sw_layoutwriter: Add unittest
    
    Change-Id: I1fc5f2f05080afcca1e6b1e04a363add811c8dbf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126150
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/layout/data/tdf145826.odt 
b/sw/qa/extras/layout/data/tdf145826.odt
new file mode 100644
index 000000000000..b6f84db563d3
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf145826.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index c7812a5ae996..ce2b8e7f2339 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3427,6 +3427,23 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128399)
     CPPUNIT_ASSERT_EQUAL(nExpected, aPosition.nNode.GetIndex());
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf145826)
+{
+    createSwDoc(DATA_DIRECTORY, "tdf145826.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    assertXPath(pXmlDoc, "/root/page/body/section/column", 2);
+
+    // Without the fix in place, this test would have failed with
+    // - Expected: 1
+    // - Actual  : 0
+    assertXPath(pXmlDoc, "/root/page/body/section/column[1]/ftncont", 1);
+    assertXPath(pXmlDoc, "/root/page/body/section/column[2]/ftncont", 1);
+    assertXPath(pXmlDoc, "/root/page/body/section/column[1]/ftncont/ftn", 3);
+    assertXPath(pXmlDoc, "/root/page/body/section/column[2]/ftncont/ftn", 3);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf105481)
 {
     createSwDoc(DATA_DIRECTORY, "tdf105481.odt");