From b652ebda7fa4e6c8db2f934bf4c8d2927f5c2332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Wed, 2 Nov 2022 09:08:50 +0100 Subject: [PATCH] Revert "tdf#151622 PPTX: fix export of show as icon option" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ea62cacd129f03813d7d3d214bf9aa2ae60bbef4. Reason for revert: not declared macros ODP & PPTX in unit test Change-Id: Ic2c3a39ff36401f49f3d759eb60645ed239b1d4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142142 Tested-by: László Németh Reviewed-by: László Németh --- oox/source/export/shapes.cxx | 7 ------- sd/qa/unit/data/odp/ole_icon.odp | Bin 18926 -> 0 bytes sd/qa/unit/export-tests-ooxml3.cxx | 19 ------------------- 3 files changed, 26 deletions(-) delete mode 100644 sd/qa/unit/data/odp/ole_icon.odp diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 541f54a0fdb8..d102880af7bd 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -2592,10 +2591,6 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape ) TOOLS_WARN_EXCEPTION("oox.shape", "ShapeExport::WriteOLEObject"); } - sal_Int64 nAspect; - bool bShowAsIcon = (xPropSet->getPropertyValue("Aspect") >>= nAspect) - && nAspect == embed::Aspects::MSOLE_ICON; - OUString const sRelId = mpFB->addRelation( mpFS->getOutputStream(), sRelationType, Concat2View(OUString::createFromAscii(GetRelationCompPrefix()) + sFileName)); @@ -2622,7 +2617,6 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape ) if (pProgID) { mpFS->startElementNS( mnXmlNamespace, XML_oleObj, - XML_showAsIcon, sax_fastparser::UseIf("1", bShowAsIcon), XML_progId, pProgID, FSNS(XML_r, XML_id), sRelId, XML_spid, "" ); @@ -2631,7 +2625,6 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape ) { mpFS->startElementNS( mnXmlNamespace, XML_oleObj, //? XML_name, "Document", - XML_showAsIcon, sax_fastparser::UseIf("1", bShowAsIcon), FSNS(XML_r, XML_id), sRelId, // The spec says that this is a required attribute, but PowerPoint can only handle an empty value. XML_spid, "" ); diff --git a/sd/qa/unit/data/odp/ole_icon.odp b/sd/qa/unit/data/odp/ole_icon.odp deleted file mode 100644 index 073899c6e56436d4a0d3a4a94cac37b55e9dc693..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18926 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 ZqLUT_`54tcY?L1__mBOL8vn1@{{VrUl<@!n diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 93c8a3ac908e..a4e5d882d8e6 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -129,7 +129,6 @@ public: void testTdf94122_autoColor(); void testTdf124333(); void testAutofittedTextboxIndent(); - void testTdf151622_oleIcon(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest3); @@ -219,7 +218,6 @@ public: CPPUNIT_TEST(testTdf94122_autoColor); CPPUNIT_TEST(testTdf124333); CPPUNIT_TEST(testAutofittedTextboxIndent); - CPPUNIT_TEST(testTdf151622_oleIcon); CPPUNIT_TEST_SUITE_END(); virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override @@ -2073,23 +2071,6 @@ void SdOOXMLExportTest3::testAutofittedTextboxIndent() "691200"); } -void SdOOXMLExportTest3::testTdf151622_oleIcon() -{ - auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/ole_icon.odp"), ODP); - - utl::TempFileNamed tmpfile; - xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile); - xDocShRef->DoClose(); - - xmlDocUniquePtr pXml = parseExport(tmpfile, "ppt/slides/slide1.xml"); - - // Without the accompanying fix in place, this test would have failed with: - // - Expression: prop - // - In ..., XPath '//p:oleObj' no attribute 'showAsIcon' exist - // i.e. show as icon option wasn't exported. - assertXPath(pXml, "//p:oleObj", "showAsIcon", "1"); -} - CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest3); CPPUNIT_PLUGIN_IMPLEMENT();