ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Revert "tdf#151622 PPTX: fix export of show as icon option"

Browse Source 
This reverts commit ea62cacd12.

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>
This commit is contained in:
László Németh
2022-11-02 09:09:21 +01:00
parent f397ebce37
commit b652ebda7f
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oox/source/export/shapes.cxx
-7
View File
@@ -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, "" );
sd/qa/unit/data/odp/ole_icon.odp
BIN
View File
Binary file not shown.
sd/qa/unit/export-tests-ooxml3.cxx
-19
View File
@@ -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();