diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-25 21:26:43 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-06 14:00:14 +0200 |
| commit | fdfc672dde686d18e6213e642967bbdcdcc86146 (patch) | |
| tree | bc11744dc10ad7610959825f469a8c367351ae50 /sw/qa/extras/layout | |
| parent | af5a64847248f9208ee2cd540446f150c02f60e2 (diff) | |
forcepoint#91 fix crash on layout of specific html
Change-Id: I145649e18f382c67ea34290f44fa219b7926127f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit be04a8072e4af30ca6ead36aa92d5f380cd9feb9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132483
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/qa/extras/layout')
| -rw-r--r-- | sw/qa/extras/layout/data/forcepoint89.html | bin | 0 -> 3321 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/data/forcepoint91.html | bin | 0 -> 49256 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/data/tdf147485-forcepoint.doc | bin | 0 -> 62544 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 25 |
4 files changed, 23 insertions, 2 deletions
diff --git a/sw/qa/extras/layout/data/forcepoint89.html b/sw/qa/extras/layout/data/forcepoint89.html Binary files differnew file mode 100644 index 000000000000..7998a2b0b979 --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint89.html diff --git a/sw/qa/extras/layout/data/forcepoint91.html b/sw/qa/extras/layout/data/forcepoint91.html Binary files differnew file mode 100644 index 000000000000..eacbd2e05ab8 --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint91.html diff --git a/sw/qa/extras/layout/data/tdf147485-forcepoint.doc b/sw/qa/extras/layout/data/tdf147485-forcepoint.doc Binary files differnew file mode 100644 index 000000000000..cb630efb8717 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf147485-forcepoint.doc diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index fd48e9da9a2c..11d2ffa7b570 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2493,8 +2493,17 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepointFootnoteFrame) createSwDoc(DATA_DIRECTORY, "forcepoint-swfootnoteframe-1.rtf"); } -//FIXME: disabled after failing again with fixed layout -//CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76) { createSwDoc(DATA_DIRECTORY, "forcepoint76-1.rtf"); } +//just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76) +{ + createSwDoc(DATA_DIRECTORY, "forcepoint76-1.rtf"); +} + +//just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint89) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint89.html"); +} //just care it doesn't crash/assert CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint90) @@ -2503,6 +2512,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint90) } //just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint91) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint91.html"); +} + +//just care it doesn't crash/assert CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint92) { createSwDoc(DATA_DIRECTORY, "forcepoint92.doc"); @@ -2514,6 +2529,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint94) createSwWebDoc(DATA_DIRECTORY, "forcepoint94.html"); } +//just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint) +{ + createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.doc"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058) { SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118058.fodt"); |