summaryrefslogtreecommitdiff
path: root/oox/qa
diff options
context:
space:
mode:
authorTünde Tóth <toth.tunde@nisz.hu>2022-09-13 10:29:03 +0200
committerLászló Németh <nemeth@numbertext.org>2022-09-28 14:16:50 +0200
commitadc042f95d3dbd65b778260025d59283146916e5 (patch)
treebe039e80dd6ca2d4b2d8d2baa4c5af0f5ae11ebd /oox/qa
parent36003e7644014cde9330bf45fee3815278a74035 (diff)
tdf#124333 PPTX import: fix Z-order of embedded OLE objects
Choose mc:Choice in a:graphicData element if the selected p:oleObj element has a shape id to avoid of shape duplication which created also bad layout/overlapping because of the different Z-order of the duplicated shape. Change-Id: Idecff4903c2d637bc82353f13352cac72413cec1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140041 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox/qa')
-rw-r--r--oox/qa/unit/vml.cxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx
index 9dcaaef83cc4..61730c744220 100644
--- a/oox/qa/unit/vml.cxx
+++ b/oox/qa/unit/vml.cxx
@@ -192,18 +192,13 @@ CPPUNIT_TEST_FIXTURE(OoxVmlTest, testGraphicStroke)
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> xShape;
- for (sal_Int32 i = 0; i < xDrawPage->getCount(); ++i)
- {
- uno::Reference<lang::XServiceInfo> xInfo(xDrawPage->getByIndex(i), uno::UNO_QUERY);
- if (!xInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
- {
- continue;
- }
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+ uno::Reference<beans::XPropertySet> xShape;
+ uno::Reference<lang::XServiceInfo> xInfo(xDrawPage->getByIndex(0), uno::UNO_QUERY);
+ if (xInfo->supportsService("com.sun.star.drawing.OLE2Shape"))
xShape.set(xInfo, uno::UNO_QUERY);
- break;
- }
+
CPPUNIT_ASSERT(xShape.is());
drawing::LineStyle eLineStyle{};