diff options
| -rwxr-xr-x | sw/qa/extras/ooxmlimport/data/tdf109053.docx | bin | 0 -> 12195 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 21 |
3 files changed, 22 insertions, 7 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf109053.docx b/sw/qa/extras/ooxmlimport/data/tdf109053.docx Binary files differnew file mode 100755 index 000000000000..f700c4d6a48d --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf109053.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 0ff3f1cdc71a..1c41a5fe2813 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1394,6 +1394,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108545_embeddedDocxIcon, "tdf108545_embeddedDocx } #endif + +DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") +{ + // Table was imported into a text frame which led to a one page document + // Originally the table takes two pages, so Writer should import it accordingly. + CPPUNIT_ASSERT_EQUAL(getPages(), 2); +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 587483403a91..dbd652248969 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1062,20 +1062,27 @@ 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. // 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 ) + const sal_Int32 nMagicNumber = 469; + + // If the table's with is smaller than the text area width, text might + // be next to the table and so it should behave as a floating table. + if ( (nTableWidth + nMagicNumber) < nTextAreaWidth ) return true; - // If the position is relative to the edge of the page, then we always - // create the fly. + // If the position is relative to the edge of the page, then we need to check the whole + // page width to see whether text can fit next to the table. if ( rInfo.getPropertyValue( "HoriOrientRelation" ) == text::RelOrientation::PAGE_FRAME ) - return true; + { + // If the table is wide enough to that no text fits next to it, then don't create a fly + // for the table: no wrapping will be performed anyway, but multi-page + // tables will be broken. + if ((nTableWidth + nMagicNumber) < (nPageWidth - std::min(GetLeftMargin(), GetRightMargin()))) + return true; + } // If there are columns, always create the fly, otherwise the columns would // restrict geometry of the table. |