sw/qa/extras/ooxmlexport/data/tdf134114_allowOverlap.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 7 +++++++ writerfilter/source/dmapper/GraphicImport.cxx | 3 +++ writerfilter/source/dmapper/PropertyIds.cxx | 1 + writerfilter/source/dmapper/PropertyIds.hxx | 1 + 5 files changed, 12 insertions(+)
New commits: commit 3eb90b3370ca0284fdbf09f37d7dc63e5d158be7 Author: Justin Luth <[email protected]> AuthorDate: Sat Jun 3 08:13:00 2023 -0400 Commit: Justin Luth <[email protected]> CommitDate: Sat Jun 3 18:37:54 2023 +0200 tdf#134114 writerfilter: pass on AllowOverlap to graphics make CppunitTest_sw_ooxmlexport18 \ CPPUNIT_TEST_NAME=testTdf134114_allowOverlap The unit test has terrible layout after a round-trip... Change-Id: I448af1c6b0c5135eb6d41dd6aa0c4bf00506ebbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152572 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/data/tdf134114_allowOverlap.docx b/sw/qa/extras/ooxmlexport/data/tdf134114_allowOverlap.docx new file mode 100644 index 000000000000..637d4b6b9435 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf134114_allowOverlap.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 63f5b419df7f..50a058d19c9d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -529,6 +529,13 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf76022_textboxWrap) CPPUNIT_ASSERT_EQUAL(2, getPages()); } +DECLARE_OOXMLEXPORT_TEST(testTdf134114_allowOverlap, "tdf134114_allowOverlap.docx") +{ + // CPPUNIT_ASSERT_EQUAL(1, getPages()); + CPPUNIT_ASSERT(!getProperty<bool>(getShape(1), "AllowOverlap")); + CPPUNIT_ASSERT(getProperty<bool>(getShape(2), "AllowOverlap")); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf149551_mongolianVert) { // Given a docx document with a shape with vert="mongolianVert". diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 2351100f06bb..c6dd379e9481 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1854,6 +1854,9 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ), uno::Any(m_pImpl->m_bLayoutInCell)); + xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_ALLOW_OVERLAP), + uno::Any(m_pImpl->m_bAllowOverlap)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND_CONTOUR ), uno::Any(m_pImpl->m_bContour)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_CONTOUR_OUTSIDE ), diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 935e9dfd2075..e945dc2609b2 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -161,6 +161,7 @@ const OUString & getPropertyName( PropertyIds eId ) { PROP_PAGE_TOGGLE, u"PageToggle"}, { PROP_BACK_COLOR, u"BackColor"}, { PROP_BACK_COLOR_TRANSPARENCY, u"BackColorTransparency"}, + { PROP_ALLOW_OVERLAP, u"AllowOverlap"}, { PROP_ALTERNATIVE_TEXT, u"AlternativeText"}, { PROP_HEADER_TEXT_LEFT, u"HeaderTextLeft"}, { PROP_HEADER_TEXT, u"HeaderText"}, diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index d708e566fcd9..083051f8d9e7 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -35,6 +35,7 @@ enum PropertyIds ,PROP_ADJUST ,PROP_ADJUST_CONTRAST ,PROP_ADJUST_LUMINANCE + ,PROP_ALLOW_OVERLAP ,PROP_ALTERNATIVE_TEXT ,PROP_ANCHOR_TYPE ,PROP_AUTOMATIC_DISTANCE
