diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-17 10:00:32 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-17 10:24:32 +0100 |
| commit | 8b6ff51bb89db0d7050bb4d00c0ec797b4754f25 (patch) | |
| tree | 4c251b0ce9f174e035e9dead7490eecd96bd0791 /sw/qa | |
| parent | e5fd7c2dacf3c128cdc62622e736ce8abbc578a5 (diff) | |
fdo#74357 DOCX import: avoid layout problem with automatic spacing
Commit 279ff2e03371542d014bf281e73282ba8080cf6b (bnc#816593 DOCX import:
fix auto para spacing without compat option, 2013-08-28) corrected the
value of "auto" paragraph spacing, but unfortunately this triggers a
layout problem:
warn:legacy.osl:12692:1:sw/source/core/layout/tabfrm.cxx:2513: debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910
resulting in "the rest of the table is not rendered by the layout".
Given that we backported the original fix to stable branches as well,
just stay on the safe side and revert back to the original behavior in
case the document requests the web layout.
Change-Id: I72683530b5218beff084bec8218cc99946b44802
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 41089c974e32..7d9e4f523135 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -752,6 +752,10 @@ DECLARE_OOXMLIMPORT_TEST(testFdo74357, "fdo74357.docx") uno::Reference<container::XIndexAccess> xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); // This was 0. CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); + + // Bottom margin of the first paragraph was too large, causing a layout problem. + // This was 494. + CPPUNIT_ASSERT_EQUAL(sal_Int32(86), getProperty<sal_Int32>(getParagraph(1), "ParaBottomMargin")); } DECLARE_OOXMLIMPORT_TEST(testFdo55187, "fdo55187.docx") |