diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-28 14:40:08 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-28 15:43:55 +0000 |
| commit | 043c349f144b615836091707147e57616a1261e7 (patch) | |
| tree | ad7d2051c52ef4895415199eaabb5d9af10a4ba2 /sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | |
| parent | ade0a153f453500f15343380ac937252992733e0 (diff) | |
tdf#153874 writerfilter: fix anchoring of decorative shapes
Turns out as-char flys can be decorative too.
The confusing GraphicImport takes a GraphicImportType by value but
everything else is a reference to a DomainMapper_Impl member.
The latter appears to work better so handle GraphicImportType the same
way and remove the function parameter.
(regression from commit 31084ebb59093be7dfe5ab53a20fdb3bcfde34b6)
Change-Id: I18c1d47d39751e8ddcaa52498077d89c43a934e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147998
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport16.cxx')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 99c0b2c9ffe7..9eb7eabd2434 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -823,6 +823,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133473_shadowSize, "tdf133473.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(200000), nSize1); } +DECLARE_OOXMLEXPORT_TEST(testTdf153874, "image_through_shape.docx") +{ + uno::Reference<beans::XPropertySet> const xShape1(getShapeByName(u"Test1"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> const xShape2(getShapeByName(u"Rectangle 1"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, xShape1->getPropertyValue("AnchorType").get<text::TextContentAnchorType>()); + CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, xShape2->getPropertyValue("AnchorType").get<text::TextContentAnchorType>()); + CPPUNIT_ASSERT_LESS(xShape2->getPropertyValue("ZOrder").get<sal_uInt64>(), xShape1->getPropertyValue("ZOrder").get<sal_uInt64>()); +} + DECLARE_OOXMLEXPORT_TEST(testTextBoxZOrder, "testTextBoxZOrder.docx") { // Is load successful? |