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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/qa/unit/data/odp/ole_icon.odp | bin | 18926 -> 0 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 19 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sd/qa/unit/data/odp/ole_icon.odp b/sd/qa/unit/data/odp/ole_icon.odp Binary files differdeleted file mode 100644 index 073899c6e564..000000000000 --- a/sd/qa/unit/data/odp/ole_icon.odp +++ /dev/null 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(); |