dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 12 ------------
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 4 ++--
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 6 ------
4 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit 343bfc6808320d435686527f3a28b88faa6a3398
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Sep 11 19:27:35 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Fri Sep 13 03:46:23 2024 +0200
tdf#162926 Revert "tdf#100037 vml import: add AS_CHAR images...
... to zOrder calculation"
This reverts my 24.8 commit 6c2ab0f3ca440f6e10b438e6ee0e235cbe155216.
Change-Id: Ia163c5adf7edfa70e49a85be6eea7908ae93ef79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173240
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder.docx
b/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder.docx
deleted file mode 100644
index 5f3e9b358392..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder.docx and
/dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index b7c170b76cf2..529df29a0c9d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -1066,18 +1066,6 @@
DECLARE_OOXMLEXPORT_TEST(testTdf159158_zOrder_headerBehind2, "tdf159158_zOrder_h
CPPUNIT_ASSERT(!getProperty<bool>(zOrder1, u"Opaque"_ustr));
}
-DECLARE_OOXMLEXPORT_TEST(testTdf100037_inlineZOrder,
"tdf100037_inlineZOrder.docx")
-{
- // given a floating textbox followed by an inline image,
- // an inline image should always be behind a heaven-layer floating object.
- uno::Reference<beans::XPropertySet> zOrder0(getShape(1), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder1(getShape(2), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(zOrder0,
u"ZOrder"_ustr)); // lower
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(zOrder1,
u"ZOrder"_ustr)); // higher
- CPPUNIT_ASSERT_EQUAL(u"Image 2"_ustr, getProperty<OUString>(zOrder0,
u"LinkDisplayName"_ustr));
- CPPUNIT_ASSERT_EQUAL(u"Frame1"_ustr, getProperty<OUString>(zOrder1,
u"LinkDisplayName"_ustr));
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf155903, "tdf155903.odt")
{
// Without the accompanying fix in place, this test would have crashed,
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 5bfb414010a6..3dd12c57930a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1233,7 +1233,7 @@ CPPUNIT_TEST_FIXTURE(Test, testActiveXControlAlign)
CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// First check box aligned as a floating object
- uno::Reference<drawing::XControlShape> xControlShape(getShape(2),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XControlShape> xControlShape(getShape(1),
uno::UNO_QUERY_THROW);
// Check whether we have the right control
uno::Reference<beans::XPropertySet>
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
@@ -1254,7 +1254,7 @@ CPPUNIT_TEST_FIXTURE(Test, testActiveXControlAlign)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2341), xShape->getPosition().Y);
// Second check box aligned inline / as character
- xControlShape.set(getShape(1), uno::UNO_QUERY_THROW);
+ xControlShape.set(getShape(2), uno::UNO_QUERY_THROW);
// Check whether we have the right control
xPropertySet.set(xControlShape->getControl(), uno::UNO_QUERY);
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index bf12873e7404..8ac5f9279e0c 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -4917,12 +4917,6 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference< drawing::XShape
if(aPropMargin)
xShapePropertySet->setPropertyValue(getPropertyName(PROP_BOTTOM_MARGIN),
aPropMargin->second);
-
- sal_Int64 zOrder = SAL_MIN_INT64;
- xShapePropertySet->setPropertyValue(u"ZOrder"_ustr,
- uno::Any(rZOrderHelper.findZOrder(zOrder,
/*LastDuplicateWins*/true)));
- rZOrderHelper.addItem(xShapePropertySet, zOrder);
- checkZOrderStatus = true;
}
else
{
