dev/null |binary
oox/source/export/shapes.cxx | 7 -------
sd/qa/unit/export-tests-ooxml3.cxx | 19 -------------------
3 files changed, 26 deletions(-)
New commits:
commit b652ebda7fa4e6c8db2f934bf4c8d2927f5c2332
Author: László Németh <nem...@numbertext.org>
AuthorDate: Wed Nov 2 09:08:50 2022 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Wed Nov 2 09:09:21 2022 +0100
Revert "tdf#151622 PPTX: fix export of show as icon option"
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 <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
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 <com/sun/star/drawing/ConnectorType.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
@@ -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 073899c6e564..000000000000
Binary files a/sd/qa/unit/data/odp/ole_icon.odp and /dev/null differ
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();
