dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 56 -------------------
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 4 -
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 28 ---------
4 files changed, 2 insertions(+), 86 deletions(-)
New commits:
commit 679e61934c62744b43a60c73fc4f796d9de144dc
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Sep 11 19:27:35 2024 -0400
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 13 07:50:31 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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173307
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
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 cdf67729e604..f46f38f036ae 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -1064,18 +1064,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,
"ZOrder")); // lower
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(zOrder1,
"ZOrder")); // higher
- CPPUNIT_ASSERT_EQUAL(OUString("Image 2"), getProperty<OUString>(zOrder0,
"LinkDisplayName"));
- CPPUNIT_ASSERT_EQUAL(OUString("Frame1"), getProperty<OUString>(zOrder1,
"LinkDisplayName"));
-}
-
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 d8a6d050a852..f6847529d6a0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1223,7 +1223,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);
@@ -1244,7 +1244,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 d8ec8586865f..80cf36ed1315 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -4846,12 +4846,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
{
commit 12c6c9166d3ba74e0c22253dd4d8e90a03800a82
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Sep 11 19:22:10 2024 -0400
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 13 07:50:25 2024 +0200
tdf#162926 Revert "tdf#100037 vml import: set fly-anchored AS_CHARs...
...above fly's zOrder"
This reverts my 24.8 commit f714fb262ad8561afcababf4b7a97dedb1b72c15.
Some activeX binary (I assume) seemed to be composed of two parts
and yet didn't have a TextBox property, but when sent to the background
the textbox part of it disappeared.
I assume it was some kind of two-part monstrosity,
but nothing in the ServiceInfo indicated anything excludable.
Change-Id: I6e088a74e62db8b2bb732ba66e2cb3319b9c401e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173239
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173306
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder2.docx
b/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder2.docx
deleted file mode 100644
index e30824ba10c8..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder2.docx and
/dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder3.docx
b/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder3.docx
deleted file mode 100644
index d97bd7ecb291..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf100037_inlineZOrder3.docx and
/dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index 58f833d85732..cdf67729e604 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -1076,50 +1076,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf100037_inlineZOrder,
"tdf100037_inlineZOrder.doc
CPPUNIT_ASSERT_EQUAL(OUString("Frame1"), getProperty<OUString>(zOrder1,
"LinkDisplayName"));
}
-DECLARE_OOXMLEXPORT_TEST(testTdf100037_inlineZOrder2,
"tdf100037_inlineZOrder2.docx")
-{
- // given a yellow floating textbox-with-image overlapped by a blue
textbox-with-image,
- // the inline image should take its zOrder from the textbox it is in.
- if (isExported())
- return; // we don't export images inside of draw textboxes I guess
-
- uno::Reference<beans::XPropertySet> zOrder0(getShape(1), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder1(getShape(2), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder2(getShape(3), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder3(getShape(4), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(zOrder0,
"ZOrder")); // lower
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(zOrder1,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(zOrder2,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty<sal_Int32>(zOrder3,
"ZOrder")); // higher
- // yellow textbox (Frame1) is the lowest
- CPPUNIT_ASSERT_EQUAL(OUString("Frame1"), getProperty<OUString>(zOrder0,
"LinkDisplayName"));
- //CPPUNIT_ASSERT_EQUAL(OUString("Image1"), getProperty<OUString>(zOrder1,
"Name"));
- CPPUNIT_ASSERT_EQUAL(OUString("Frame2"), getProperty<OUString>(zOrder2,
"LinkDisplayName"));
- // CPPUNIT_ASSERT_EQUAL(OUString("Image2"), getProperty<OUString>(zOrder3,
"LinkDisplayName"));
-}
-
-DECLARE_OOXMLEXPORT_TEST(testTdf100037_inlineZOrder3,
"tdf100037_inlineZOrder3.docx")
-{
- // given a yellow floating textbox-with-image that overlaps a blue
textbox-with-image,
- // the inline image should take its zOrder from the textbox it is in.
- if (isExported())
- return; // we don't export images inside of draw textboxes I guess
-
- uno::Reference<beans::XPropertySet> zOrder0(getShape(1), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder1(getShape(2), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder2(getShape(3), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> zOrder3(getShape(4), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(zOrder0,
"ZOrder")); // lower
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(zOrder1,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(zOrder2,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty<sal_Int32>(zOrder3,
"ZOrder")); // higher
- // blue textbox (Frame2) is the lowest
- CPPUNIT_ASSERT_EQUAL(OUString("Frame2"), getProperty<OUString>(zOrder0,
"LinkDisplayName"));
- // CPPUNIT_ASSERT_EQUAL(OUString("Image2"), getProperty<OUString>(zOrder1,
"LinkDisplayName"));
- CPPUNIT_ASSERT_EQUAL(OUString("Frame1"), getProperty<OUString>(zOrder2,
"LinkDisplayName"));
- // CPPUNIT_ASSERT_EQUAL(OUString("Image1"), getProperty<OUString>(zOrder3,
"LinkDisplayName"));
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf155903, "tdf155903.odt")
{
// Without the accompanying fix in place, this test would have crashed,
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index e9a8d19d05d7..d8ec8586865f 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -4847,29 +4847,7 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference< drawing::XShape
xShapePropertySet->setPropertyValue(getPropertyName(PROP_BOTTOM_MARGIN),
aPropMargin->second);
- sal_Int64 zOrder = SAL_MIN_INT64; // lowest in heaven-layer:
AS_CHAR in body text
- // AS_CHARs anchored inside a fly should be just above the
fly's zOrder
- if (m_vAnchoredStack.size() > 1)
- {
- uno::Reference<beans::XPropertySet> xParentPropertySet(
- m_vAnchoredStack[m_vAnchoredStack.size() -
2].xTextContent,
- uno::UNO_QUERY_THROW);
- uno::Sequence<beans::PropertyValue> aGrabBag;
-
xParentPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= aGrabBag;
- for (const auto& rProp : aGrabBag)
- {
- if (rProp.Name == "VML-Z-ORDER")
- {
- rProp.Value >>= zOrder;
- ++zOrder;
- GraphicZOrderHelper::adjustRelativeHeight(zOrder,
/*IsZIndex=*/true,
- zOrder <
0,
-
IsInHeaderFooter());
-
xShapePropertySet->setPropertyValue(getPropertyName(PROP_OPAQUE),
-
uno::Any(zOrder >= 0));
- }
- }
- }
+ sal_Int64 zOrder = SAL_MIN_INT64;
xShapePropertySet->setPropertyValue(u"ZOrder"_ustr,
uno::Any(rZOrderHelper.findZOrder(zOrder,
/*LastDuplicateWins*/true)));
rZOrderHelper.addItem(xShapePropertySet, zOrder);
