tdf#114306: Revert commits fixing this issue ( 6.1 only )

Revert "tdf#114306 fix crash caused by special document 2"

This reverts commit d30eefb677b446886f7b5bab6de93d489ba63529.

Revert "tdf#114306 fix crash caused by special document"

This reverts commit e4400f4c4e267f8528df3a7d5a09623c888bd10c.

Revert "tdf#114306 fix unexpected page break in row-spanned table"

This reverts commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50

Change-Id: Ifff799616f12ee428a3f923f6510b20059f5bc71
Reviewed-on: https://gerrit.libreoffice.org/69848
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

3 files changed, 0 insertions, 28 deletions

diff --git a/sw/qa/extras/uiwriter/data/fdo114306.odt b/sw/qa/extras/uiwriter/data/fdo114306.odt
deleted file mode 100755
index 5a7d2f9ca864..000000000000
--- a/sw/qa/extras/uiwriter/data/fdo114306.odt
+++ /dev/null
diff --git a/sw/qa/extras/uiwriter/data/fdo114306_2.odt b/sw/qa/extras/uiwriter/data/fdo114306_2.odt
deleted file mode 100755
index b4bebc58add5..000000000000
--- a/sw/qa/extras/uiwriter/data/fdo114306_2.odt
+++ /dev/null
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 6d1f2c51c684..8d0e194d7a65 100755
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -332,8 +332,6 @@ public:
     void testTdf112448();
     void testTdf113790();
     void testTdf108048();
-    void testTdf114306();
-    void testTdf114306_2();
     void testTdf113481();
     void testTdf115013();
     void testTdf114536();
@@ -528,8 +526,6 @@ public:
     CPPUNIT_TEST(testTdf112448);
     CPPUNIT_TEST(testTdf113790);
     CPPUNIT_TEST(testTdf108048);
-    CPPUNIT_TEST(testTdf114306);
-    CPPUNIT_TEST(testTdf114306_2);
     CPPUNIT_TEST(testTdf113481);
     CPPUNIT_TEST(testTdf115013);
     CPPUNIT_TEST(testTdf114536);
@@ -5482,30 +5478,6 @@ void SwUiWriterTest::testTdf72942()
     CPPUNIT_ASSERT_EQUAL(OUString("Liberation Sans"), getProperty<OUString>(xRun4, "CharFontName"));
 }
 
-void SwUiWriterTest::testTdf114306()
-{
-    load(DATA_DIRECTORY, "fdo114306.odt");
-    xmlDocPtr pXmlDoc = parseLayoutDump();
-
-    // There are 2 long paragraphs in cell A1.
-    // A part of paragraph 2 should flow over to the second page but
-    // *not* the whole paragraph. There should be 2 paragraphs on
-    // page 1 and 1 paragraph on page 2.
-    assertXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt", 2);
-    assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt", 1);
-}
-
-void SwUiWriterTest::testTdf114306_2()
-{
-    // tdf#114306 fix unexpected page break in row-spanned table
-    // load regression document without writer crash
-    load(DATA_DIRECTORY, "fdo114306_2.odt");
-
-    // correct number of pages
-    CPPUNIT_ASSERT_EQUAL(4, getPages());
-}
-
-
 // During insert of the document with list inside into the main document inside the list
 // we should merge both lists into one, when they have the same list properties
 void SwUiWriterTest::testTdf113877()