From 25445d24cfa87522ee4c47e4aa7e6e816cdc9a36 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 11 Jul 2017 12:44:56 +0200 Subject: tdf#109063 DOCX import: consider wrap space for multi-page floattables Follow-up to commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502 (fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame, 2013-09-03), turns out in case there is little space between the table and the edge of the body area, then there is no wrapping performed in Word, so we should not convert to floating table, either. The limit seems to be 266 twips (mm100 unit is used in the code), and this seems to be constant: it does not change if both the table and the page width is changed, nor does it change when the empty paragraph to be wrapped has a different paragraph mark size. For the majority of the documents this means no change as usually there is either no space available for wrapping or there is a lot more available. Change-Id: Ibbf7409065ba958854514f23b360be56677c8fe3 Reviewed-on: https://gerrit.libreoffice.org/39808 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/qa/extras/ooxmlexport/data/tdf109063.docx | Bin 0 -> 13191 bytes sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 8 ++++++++ writerfilter/source/dmapper/PropertyMap.cxx | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf109063.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf109063.docx b/sw/qa/extras/ooxmlexport/data/tdf109063.docx new file mode 100644 index 000000000000..70f4fe4e2f31 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf109063.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 76a567764806..6c7da90e2d96 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -97,6 +97,14 @@ DECLARE_SW_ROUNDTRIP_TEST(testBadDocm, "bad.docm", nullptr, DocmTest) CPPUNIT_ASSERT_EQUAL(OUString("MS Word 2007 XML VBA"), pTextDoc->GetDocShell()->GetMedium()->GetFilter()->GetName()); } +DECLARE_OOXMLEXPORT_TEST(testTdf109063, "tdf109063.docx") +{ + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xDrawPage = xDrawPageSupplier->getDrawPage(); + // This was 1, near-page-width table was imported as a TextFrame. + CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount()); +} + DECLARE_SW_ROUNDTRIP_TEST(testTdf108269, "tdf108269.docm", nullptr, DocmTest) { if (!mbExported) diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 7ce401bd4a95..587483403a91 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1065,7 +1065,11 @@ bool SectionPropertyMap::FloatingTableConversion( DomainMapper_Impl& rDM_Impl, F // If the table is wider than the text area, then don't create a fly // for the table: no wrapping will be performed anyway, but multi-page // tables will be broken. - if ( nTableWidth < nTextAreaWidth ) + // It seems Word has a limit here, so that in case the table width is quite + // close to the text area width, then it won't perform a wrapping, even in + // case the content (e.g. an empty paragraph) would fit. The magic constant + // here represents this limit. + if ( (nTableWidth + 469) < nTextAreaWidth ) return true; // If the position is relative to the edge of the page, then we always -- cgit