diff options
| author | László Németh <nemeth@numbertext.org> | 2022-11-02 09:08:50 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-11-02 09:09:21 +0100 |
| commit | b652ebda7fa4e6c8db2f934bf4c8d2927f5c2332 (patch) | |
| tree | a52ea4a45adf003e701c60ba7fea5cba5208c4b1 /oox | |
| parent | f397ebce379861987b7be28cc8371cdefef7ebdc (diff) | |
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 <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
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, "" ); |