diff options
| author | Manfred Blume <manfred.blume@cib.de> | 2018-01-25 15:46:57 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-26 23:53:30 +0100 |
| commit | e4400f4c4e267f8528df3a7d5a09623c888bd10c (patch) | |
| tree | de0febdde661e8f00d6ae5f46df286adf8df0501 /sw/qa | |
| parent | ced60a5fa7824caff07846d7dd8abad3c0f31b55 (diff) | |
tdf#114306 fix crash caused by special document
Regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50
chnage signature of
static void lcl_RecalcRow( SwRowFrame& rRow, long nBottom )
to
static void lcl_RecalcRow( SwRowFrame* pRow, long nBottom )
Change-Id: Ie00435aa4bffa3d2e49896aea6894ae999a5536a
Reviewed-on: https://gerrit.libreoffice.org/48613
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/qa')
| -rwxr-xr-x | sw/qa/extras/uiwriter/data/fdo114306_2.odt | bin | 0 -> 38424 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/fdo114306_2.odt b/sw/qa/extras/uiwriter/data/fdo114306_2.odt Binary files differnew file mode 100755 index 000000000000..b4bebc58add5 --- /dev/null +++ b/sw/qa/extras/uiwriter/data/fdo114306_2.odt diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 6f4903f98d2f..4789d2d39829 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -294,6 +294,7 @@ public: void testTdf113790(); void testTdf108048(); void testTdf114306(); + void testTdf114306_2(); void testTdf113481(); void testTdf115013(); void testTdf114536(); @@ -471,6 +472,7 @@ public: CPPUNIT_TEST(testTdf113790); CPPUNIT_TEST(testTdf108048); CPPUNIT_TEST(testTdf114306); + CPPUNIT_TEST(testTdf114306_2); CPPUNIT_TEST(testTdf113481); CPPUNIT_TEST(testTdf115013); CPPUNIT_TEST(testTdf114536); @@ -5290,6 +5292,17 @@ void SwUiWriterTest::testTdf114306() 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() |