diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-01-15 15:53:19 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-18 10:59:03 +0100 |
commit | 601bcc4fce550d758db8ba3d78c9c399e57f694a (patch) | |
tree | f49b529c75be2f69e7f34d3e23c0ad3ff341641f /sd/qa | |
parent | tdf#61028 OOXML export: fix lost arcTo shape (diff) | |
download | core-601bcc4fce550d758db8ba3d78c9c399e57f694a.tar.gz core-601bcc4fce550d758db8ba3d78c9c399e57f694a.zip |
PPTX export: fix mime type of slide narrations
Import was working already for the audio stream.
Change-Id: I43ac6561c4e39decfd99587e489cb2888805bb0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109374
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109447
Diffstat (limited to 'sd/qa')
-rw-r--r-- | sd/qa/unit/data/pptx/narration.pptx | bin | 0 -> 82099 bytes | |||
-rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 19 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/narration.pptx b/sd/qa/unit/data/pptx/narration.pptx Binary files differnew file mode 100644 index 000000000000..5226ce607215 --- /dev/null +++ b/sd/qa/unit/data/pptx/narration.pptx diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index b1d3eb57f8f2..0e938e05e9c7 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -101,6 +101,7 @@ public: void testTdf134969TransparencyOnColorGradient(); void testTdf136911(); void testArcTo(); + void testNarrationMimeType(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest1); @@ -151,6 +152,7 @@ public: CPPUNIT_TEST(testTdf134969TransparencyOnColorGradient); CPPUNIT_TEST(testTdf136911); CPPUNIT_TEST(testArcTo); + CPPUNIT_TEST(testNarrationMimeType); CPPUNIT_TEST_SUITE_END(); @@ -1292,6 +1294,23 @@ void SdOOXMLExportTest1::testArcTo() assertXPath(pXmlDoc, sPath, "swAng", "2700000"); } +void SdOOXMLExportTest1::testNarrationMimeType() +{ + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/narration.pptx"), PPTX); + utl::TempFile aTempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile); + xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "[Content_Types].xml"); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: audio/mp4 + // - Actual : application/vnd.sun.star.media + // i.e. the mime type of the narration was incorrect. + assertXPath(pXmlDoc, + "/ContentType:Types/ContentType:Override[@PartName='/ppt/media/media1.m4a']", + "ContentType", "audio/mp4"); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1); CPPUNIT_PLUGIN_IMPLEMENT(); |