tdf#106867: Unit test for the export of embedded videos.

Change-Id: Ibbc3da56ace2eaaf4670e869a34ec4c1bad4bf5d
Reviewed-on: https://gerrit.libreoffice.org/41982
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>

1 files changed, 18 insertions, 6 deletions

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fe5f4c3268da..44cfc48ad089 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -967,12 +967,24 @@ void DrawingML::WriteMediaNonVisualProperties(const css::uno::Reference<css::dra
     bool bEmbed = rURL.startsWith("vnd.sun.star.Package:");
 
     // mime type
-    // TODO add more types explicitly based on the extension (?)
-    OUString aMimeType;
-    if (aExtension.equalsIgnoreAsciiCase(".wmv"))
-        aMimeType = "video/x-ms-wmv";
-    else
-        aMimeType = pMediaObj->getMediaProperties().getMimeType();
+    OUString aMimeType(pMediaObj->getMediaProperties().getMimeType());
+    if (aMimeType == "application/vnd.sun.star.media")
+    {
+        // try to set something better
+        // TODO fix the importer to actually set the mimetype on import
+        if (aExtension.equalsIgnoreAsciiCase(".avi"))
+            aMimeType = "video/x-msvideo";
+        else if (aExtension.equalsIgnoreAsciiCase(".flv"))
+            aMimeType = "video/x-flv";
+        else if (aExtension.equalsIgnoreAsciiCase(".mp4"))
+            aMimeType = "video/mp4";
+        else if (aExtension.equalsIgnoreAsciiCase(".mov"))
+            aMimeType = "video/quicktime";
+        else if (aExtension.equalsIgnoreAsciiCase(".ogv"))
+            aMimeType = "video/ogg";
+        else if (aExtension.equalsIgnoreAsciiCase(".wmv"))
+            aMimeType = "video/x-ms-wmv";
+    }
 
     OUString aVideoFileRelId;
     OUString aMediaRelId;