diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-05-25 13:40:09 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-05-25 14:59:45 +0200 |
| commit | 42a37f8ce27ad8fca222f50b712a8fed52dbda95 (patch) | |
| tree | fe195e450f32ad25b03d9ad683f2ab0d00f8fcba /sw/qa/extras/ww8export | |
| parent | 39df467cd67ca7798e814d6c57f8bfd6791fc0ef (diff) | |
Revert "tdf#104017 DOC export: be less aggressive with merging page styles"
This reverts LO 6.3.4 commit 5d1709a7c4184eb31cfc4c2d3acadff3a4a68189,
which tdf#133334 shows is wrong. How this made it past QA
is a mystery to me. There should be lots of examples.
Change-Id: I17be6e4bab44057f4535d4728825e12d068b65d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94782
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/extras/ww8export')
| -rw-r--r-- | sw/qa/extras/ww8export/data/tdf104017.doc | bin | 11776 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export3.cxx | 9 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf104017.doc b/sw/qa/extras/ww8export/data/tdf104017.doc Binary files differdeleted file mode 100644 index 878cbe25f863..000000000000 --- a/sw/qa/extras/ww8export/data/tdf104017.doc +++ /dev/null diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index 85801a003f0f..12a939eb6d31 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -556,15 +556,6 @@ DECLARE_WW8EXPORT_TEST(testPresetDash, "tdf127166_prstDash_Word97.doc") } } -DECLARE_WW8EXPORT_TEST(testTdf104017, "tdf104017.doc") -{ - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 2 - // - Actual : 1 - // i.e. the tables on the two pages were merged together to a single one on export. - CPPUNIT_ASSERT_EQUAL(2, getPages()); -} - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |