sw/qa/extras/ooxmlexport/data/tdf147646_mergedCellNumbering.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx                       |    9 
+++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 7e8ba44fed9a20b5d226b9d3733b79a35acbbe00
Author:     Satya <skompe...@opentext.com>
AuthorDate: Tue Sep 13 15:12:54 2022 +0530
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Wed Sep 14 02:49:20 2022 +0200

    tdf#147646 Add unit test
    
    Change-Id: I49adaf075aa6bad0d0230bca3d9bedfca335abb4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139832
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf147646_mergedCellNumbering.docx 
b/sw/qa/extras/ooxmlexport/data/tdf147646_mergedCellNumbering.docx
new file mode 100644
index 000000000000..680144737685
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf147646_mergedCellNumbering.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index 1bf487a1f3bc..c3b38758505e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -70,6 +70,15 @@ CPPUNIT_TEST_FIXTURE(Test, testCellSdtRedline)
     loadAndSave("cell-sdt-redline.docx");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf147646, "tdf147646_mergedCellNumbering.docx")
+{
+    parseLayoutDump();
+    //Without the fix in place, it would have failed with
+    //- Expected: 2.
+    //- Actual  : 4.
+    
CPPUNIT_ASSERT_EQUAL(OUString("2."),parseDump("/root/page/body/tab/row[4]/cell/txt/Special[@nType='PortionType::Number']","rText"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Reply via email to