diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-06 13:49:06 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-01-09 09:36:46 +0000 |
| commit | 68c05e360a65a3984d3839f563daa34e2cce0b14 (patch) | |
| tree | 3a34b708c2f5ae64d49dc5bc8bbbbae84848b2b8 | |
| parent | 37c797f8e77cc132de0139a2e60e65613a9a141a (diff) | |
tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat option
Because that's what Word does to show only part of the shape in the
bugdoc.
Conflicts:
writerfilter/source/filter/WriterFilter.cxx
Change-Id: Ic5cb84cace9237671d71eda0c64e9dadfe244cb9
Reviewed-on: https://gerrit.libreoffice.org/32782
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/32784
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf105143.docx | bin | 0 -> 13098 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105143.docx b/sw/qa/extras/ooxmlimport/data/tdf105143.docx Binary files differnew file mode 100644 index 000000000000..aa4bf40af02e --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf105143.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 0acf8f0148e8..2d1c66ba94cd 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -699,6 +699,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3257), aPolyPolygon.Coordinates[0][0].Y); } +DECLARE_OOXMLIMPORT_TEST(testTdf105143, "tdf105143.docx") +{ + OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top"); + // This was 6272, i.e. the shape was moved up (incorrect position) to be + // inside the page rectangle. + CPPUNIT_ASSERT_EQUAL(OUString("6674"), aTop); +} + DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx") { // The problem was that the floating table was imported as a non-floating one. diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index c59718f85a2f..b50a8f49743f 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -300,6 +300,7 @@ void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& x xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak", uno::makeAny(true)); xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", uno::makeAny(true)); xSettings->setPropertyValue("AllowPaddingWithoutBorders", uno::makeAny(true)); + xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::makeAny(true)); } void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) |