diff options
-rw-r--r-- | sw/qa/extras/uiwriter/data/table-in-sect.odt | bin | 0 -> 11744 bytes | |||
-rw-r--r-- | sw/qa/extras/uiwriter/data/tdf108524.odt | bin | 0 -> 9053 bytes | |||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 30 |
3 files changed, 30 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/table-in-sect.odt b/sw/qa/extras/uiwriter/data/table-in-sect.odt Binary files differnew file mode 100644 index 000000000000..f439edef997e --- /dev/null +++ b/sw/qa/extras/uiwriter/data/table-in-sect.odt diff --git a/sw/qa/extras/uiwriter/data/tdf108524.odt b/sw/qa/extras/uiwriter/data/tdf108524.odt Binary files differnew file mode 100644 index 000000000000..d8978b269cab --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf108524.odt diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 0e37981b4b58..7cd2dd41c39b 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -200,6 +200,8 @@ public: void testTdf84695(); void testTdf84695NormalChar(); void testParagraphOfTextRange(); + void testTdf108524(); + void testTableInSection(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); @@ -302,6 +304,8 @@ public: CPPUNIT_TEST(testTdf84695); CPPUNIT_TEST(testTdf84695NormalChar); CPPUNIT_TEST(testParagraphOfTextRange); + CPPUNIT_TEST(testTdf108524); + CPPUNIT_TEST(testTableInSection); CPPUNIT_TEST_SUITE_END(); private: @@ -3727,6 +3731,32 @@ void SwUiWriterTest::testParagraphOfTextRange() CPPUNIT_ASSERT_EQUAL(OUString("In section"), xParagraph->getString()); } +void SwUiWriterTest::testTdf108524() +{ + createDoc("tdf108524.odt"); + xmlDocPtr pXmlDoc = parseLayoutDump(); + // In total we expect two cells containing a section. + assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/section", 2); + + assertXPath(pXmlDoc, "/root/page[1]/body/tab/row/cell/section", 1); + // This was 0, section wasn't split, instead it was only on the first page + // and it was cut off. + assertXPath(pXmlDoc, "/root/page[2]/body/tab/row/cell/section", 1); +} + +void SwUiWriterTest::testTableInSection() +{ + // The document has a section, containing a table that spans over 2 pages. + createDoc("table-in-sect.odt"); + xmlDocPtr pXmlDoc = parseLayoutDump(); + // In total we expect 4 cells. + assertXPath(pXmlDoc, "/root/page/body/section/tab/row/cell", 4); + + // Assert that on both pages the section contains 2 cells. + assertXPath(pXmlDoc, "/root/page[1]/body/section/tab/row/cell", 2); + assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/row/cell", 2); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); |