summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTünde Tóth <toth.tunde@nisz.hu>2022-12-13 11:08:52 +0100
committerLászló Németh <nemeth@numbertext.org>2022-12-19 11:47:09 +0000
commit907da02bf8b33c080538731864225b3c44251328 (patch)
tree5e55d727c2e5b4649a7eeab25851093c8333d4e7 /sd
parent6249858a8972aef077e0249bd93cfe8f01bce4d6 (diff)
tdf#152436 PPTX export regression: fix lost shape at missing object
If the object is missing, it's still possible to keep its shape by exporting its preview graphic, as before the regression. Regression from commit adc042f95d3dbd65b778260025d59283146916e5 "tdf#124333 PPTX import: fix Z-order of embedded OLE objects". Change-Id: Ib2fd00f53a80572cfc9acaefea55015780c57da8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144040 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/pptx/ole-emf_min.pptxbin0 -> 36796 bytes
-rw-r--r--sd/qa/unit/export-tests-ooxml3.cxx11
2 files changed, 11 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/ole-emf_min.pptx b/sd/qa/unit/data/pptx/ole-emf_min.pptx
new file mode 100644
index 000000000000..0f97208fbebc
--- /dev/null
+++ b/sd/qa/unit/data/pptx/ole-emf_min.pptx
Binary files differ
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx
index 2e6a600ec686..309709317821 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -130,6 +130,7 @@ public:
void testTdf124333();
void testAutofittedTextboxIndent();
void testTdf151622_oleIcon();
+ void testTdf152436();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest3);
@@ -221,6 +222,7 @@ public:
CPPUNIT_TEST(testTdf124333);
CPPUNIT_TEST(testAutofittedTextboxIndent);
CPPUNIT_TEST(testTdf151622_oleIcon);
+ CPPUNIT_TEST(testTdf152436);
CPPUNIT_TEST_SUITE_END();
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -2105,6 +2107,15 @@ void SdOOXMLExportTest3::testTdf151622_oleIcon()
assertXPath(pXml, "//p:oleObj", "showAsIcon", "1");
}
+void SdOOXMLExportTest3::testTdf152436()
+{
+ createSdImpressDoc("pptx/ole-emf_min.pptx");
+ saveAndReload("Impress Office Open XML");
+
+ // Check number of shapes after export.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getPage(0)->getCount());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest3);
CPPUNIT_PLUGIN_IMPLEMENT();