From 78d1f1c2835b9fae0f91ed771fc1d594c7817502 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 3 Sep 2013 11:52:51 +0200 Subject: 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) Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51 --- sw/qa/extras/ooxmlimport/data/fdo68607.docx | Bin 0 -> 36117 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/fdo68607.docx (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/data/fdo68607.docx b/sw/qa/extras/ooxmlimport/data/fdo68607.docx new file mode 100644 index 000000000000..11f57064ce92 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo68607.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 9927df7c4a36..973f3b193db5 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -130,6 +130,7 @@ public: void testTableAutoNested(); void testTableStyleParprop(); void testTablePagebreak(); + void testFdo68607(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -226,6 +227,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) @@ -1530,6 +1532,14 @@ void Test::testTablePagebreak() CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, getProperty(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(); -- cgit