diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-09-03 11:52:51 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-06 11:33:02 +0000 |
| commit | 45ea0b563bbc3e8830c485e7d04aa98a52a1e2fc (patch) | |
| tree | 0e39fe36ede17d341d665430cc60cd3215b45da1 /sw | |
| parent | 869dc1a6b8a65f2bf8b3926169478ced0cf382ae (diff) | |
fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame
This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de
"Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a
frame" from the WW8 filter to the DOCX one.
(regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad)
(cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502)
Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51
Reviewed-on: https://gerrit.libreoffice.org/5788
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo68607.docx | bin | 0 -> 36117 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo68607.docx b/sw/qa/extras/ooxmlimport/data/fdo68607.docx Binary files differnew file mode 100644 index 000000000000..11f57064ce92 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/fdo68607.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 5223c8760d8d..af5a3f222c7e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -131,6 +131,7 @@ public: void testTableAutoNested(); void testTableStyleParprop(); void testTablePagebreak(); + void testFdo68607(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -227,6 +228,7 @@ void Test::run() {"table-auto-nested.docx", &Test::testTableAutoNested}, {"table-style-parprop.docx", &Test::testTableStyleParprop}, {"table-pagebreak.docx", &Test::testTablePagebreak}, + {"fdo68607.docx", &Test::testFdo68607}, }; header(); for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) @@ -1605,6 +1607,14 @@ void Test::testTablePagebreak() CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, getProperty<style::BreakType>(getParagraph(3), "BreakType")); } +void Test::testFdo68607() +{ + // Bugdoc was 8 pages in Word, 1 in Writer due to pointlessly wrapping the + // table in a frame. Exact layout may depend on fonts available, etc. -- + // but at least make sure that our table spans over multiple pages now. + CPPUNIT_ASSERT(getPages() > 1); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |