add in .webm suffix for jrb

4 files changed, 30 insertions, 6 deletions

diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 13f7997b680d..3abe09c0e37c 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -93,6 +93,7 @@
 #define CONTENT_TYPE_STR_AUDIO_MIDI "audio/midi"
 #define CONTENT_TYPE_STR_AUDIO_VORBIS "audio/vorbis"
 #define CONTENT_TYPE_STR_AUDIO_WAV "audio/wav"
+#define CONTENT_TYPE_STR_AUDIO_WEBM "audio/webm"
 #define CONTENT_TYPE_STR_X_CNT_DOCUMENT ".chaos/document"
 #define CONTENT_TYPE_STR_X_CNT_FSYSBOX ".chaos/fsys-box"
 #define CONTENT_TYPE_STR_X_CNT_CDROM_VOLUME ".chaos/fsys-cdrom-volume"
@@ -157,9 +158,10 @@
 #define CONTENT_TYPE_STR_TEXT_URL "text/x-url"
 #define CONTENT_TYPE_STR_TEXT_VCALENDAR "text/x-vCalendar"
 #define CONTENT_TYPE_STR_TEXT_VCARD "text/x-vCard"
+#define CONTENT_TYPE_STR_VIDEO_MSVIDEO "video/x-msvideo"
 #define CONTENT_TYPE_STR_VIDEO_THEORA "video/theora"
 #define CONTENT_TYPE_STR_VIDEO_VDO "video/vdo"
-#define CONTENT_TYPE_STR_VIDEO_MSVIDEO "video/x-msvideo"
+#define CONTENT_TYPE_STR_VIDEO_WEBM "audio/webm"
 #define CONTENT_TYPE_STR_X_STARMAIL "x-starmail"
 #define CONTENT_TYPE_STR_X_VRML "x-world/x-vrml"
 #define CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER "application/vnd.sun.xml.writer"
@@ -233,6 +235,7 @@ enum INetContentType
     CONTENT_TYPE_AUDIO_MIDI,
     CONTENT_TYPE_AUDIO_VORBIS,
     CONTENT_TYPE_AUDIO_WAV,
+    CONTENT_TYPE_AUDIO_WEBM,
     CONTENT_TYPE_IMAGE_GIF,
     CONTENT_TYPE_IMAGE_JPEG,
     CONTENT_TYPE_IMAGE_PCX,
@@ -243,9 +246,10 @@ enum INetContentType
     CONTENT_TYPE_TEXT_PLAIN,
     CONTENT_TYPE_TEXT_URL,
     CONTENT_TYPE_TEXT_VCARD,
+    CONTENT_TYPE_VIDEO_MSVIDEO,
     CONTENT_TYPE_VIDEO_THEORA,
     CONTENT_TYPE_VIDEO_VDO,
-    CONTENT_TYPE_VIDEO_MSVIDEO,
+    CONTENT_TYPE_VIDEO_WEBM,
     CONTENT_TYPE_X_CNT_MESSAGE,
     CONTENT_TYPE_X_CNT_DOCUMENT,
     CONTENT_TYPE_X_CNT_POP3BOX,
diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 7171ed88b5ff..599e645978ff 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -149,7 +149,12 @@
 #define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+114)
 #define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+115)
 #define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+116)
-#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_APP_SXIPACKED)
+
+
+#define STR_SVT_MIMETYPE_VIDEO_WEBM         (STR_SVT_MIMETYPE_START+117)
+#define STR_SVT_MIMETYPE_AUDIO_WEBM         (STR_SVT_MIMETYPE_START+118)
+
+#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_AUDIO_WEBM)
 
 #define STR_COLUM_DT_AUTO                   (STR_SVT_MIMETYPE_END+1)
 
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 8bc44fdc2dd8..cb16349ab487 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -301,6 +301,7 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
         { CONTENT_TYPE_STR_AUDIO_MIDI, CONTENT_TYPE_AUDIO_MIDI, "mid" },
         { CONTENT_TYPE_STR_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_VORBIS, "ogg" },
         { CONTENT_TYPE_STR_AUDIO_WAV, CONTENT_TYPE_AUDIO_WAV, "wav" },
+        { CONTENT_TYPE_STR_AUDIO_WEBM, CONTENT_TYPE_AUDIO_WEBM, "webm" },
         { CONTENT_TYPE_STR_IMAGE_GENERIC, CONTENT_TYPE_IMAGE_GENERIC, "tmp" },
         { CONTENT_TYPE_STR_IMAGE_GIF, CONTENT_TYPE_IMAGE_GIF, "gif" },
         { CONTENT_TYPE_STR_IMAGE_JPEG, CONTENT_TYPE_IMAGE_JPEG, "jpg" },
@@ -330,9 +331,10 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
         { CONTENT_TYPE_STR_TEXT_VCALENDAR, CONTENT_TYPE_TEXT_VCALENDAR,
           "vcs" },
         { CONTENT_TYPE_STR_TEXT_VCARD, CONTENT_TYPE_TEXT_VCARD, "vcf" },
+        { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO, "avi" },
         { CONTENT_TYPE_STR_VIDEO_THEORA, CONTENT_TYPE_VIDEO_THEORA, "ogg" },
         { CONTENT_TYPE_STR_VIDEO_VDO, CONTENT_TYPE_VIDEO_VDO, "vdo" },
-        { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO, "avi" },
+        { CONTENT_TYPE_STR_VIDEO_WEBM, CONTENT_TYPE_VIDEO_WEBM, "webm" },
         { CONTENT_TYPE_STR_X_STARMAIL, CONTENT_TYPE_X_STARMAIL, "smd" },
         { CONTENT_TYPE_STR_X_VRML, CONTENT_TYPE_X_VRML, "wrl" }
 };
@@ -361,6 +363,7 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
         STR_SVT_MIMETYPE_AUDIO_MIDI, // CONTENT_TYPE_AUDIO_MIDI
         STR_SVT_MIMETYPE_AUDIO_VORBIS, // CONTENT_TYPE_AUDIO_VORBIS
         STR_SVT_MIMETYPE_AUDIO_WAV, // CONTENT_TYPE_AUDIO_WAV
+        STR_SVT_MIMETYPE_AUDIO_WEBM, // CONTENT_TYPE_AUDIO_WEBM
         STR_SVT_MIMETYPE_IMAGE_GIF, // CONTENT_TYPE_IMAGE_GIF
         STR_SVT_MIMETYPE_IMAGE_JPEG, // CONTENT_TYPE_IMAGE_JPEG
         STR_SVT_MIMETYPE_IMAGE_PCX, // CONTENT_TYPE_IMAGE_PCX
@@ -371,9 +374,10 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
         STR_SVT_MIMETYPE_TEXT_PLAIN, // CONTENT_TYPE_TEXT_PLAIN
         STR_SVT_MIMETYPE_TEXT_URL, // CONTENT_TYPE_TEXT_URL
         STR_SVT_MIMETYPE_TEXT_VCARD, // CONTENT_TYPE_TEXT_VCARD
+        STR_SVT_MIMETYPE_VIDEO_MSVIDEO, // CONTENT_TYPE_VIDEO_MSVIDEO
         STR_SVT_MIMETYPE_VIDEO_THEORA, // CONTENT_TYPE_VIDEO_THEORA
         STR_SVT_MIMETYPE_VIDEO_VDO, // CONTENT_TYPE_VIDEO_VDO
-        STR_SVT_MIMETYPE_VIDEO_MSVIDEO, // CONTENT_TYPE_VIDEO_MSVIDEO
+        STR_SVT_MIMETYPE_VIDEO_WEBM, // CONTENT_TYPE_VIDEO_WEBM
         STR_SVT_MIMETYPE_CNT_MSG, // CONTENT_TYPE_X_CNT_MESSAGE
         STR_SVT_MIMETYPE_CNT_DOCUMENT, // CONTENT_TYPE_X_CNT_DOCUMENT
         STR_SVT_MIMETYPE_CNT_POP3BOX, // CONTENT_TYPE_X_CNT_POP3BOX
@@ -555,6 +559,7 @@ MediaTypeEntry const aStaticExtensionMap[]
         { "vdo", CONTENT_TYPE_VIDEO_VDO, "" },
         { "vor", CONTENT_TYPE_APP_VND_TEMPLATE, "" },
         { "wav", CONTENT_TYPE_AUDIO_WAV, "" },
+        { "webm", CONTENT_TYPE_VIDEO_WEBM, "" },
         { "wmf", CONTENT_TYPE_IMAGE_GENERIC, "" },
         { "wrl", CONTENT_TYPE_X_VRML, "" },
         { "xbm", CONTENT_TYPE_IMAGE_GENERIC, "" },
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 7d8643862598..1d191c9d93b6 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -119,6 +119,11 @@ String STR_SVT_MIMETYPE_AUDIO_WAV
     Text [ en-US ] = "Audio file" ;
 };
 
+String STR_SVT_MIMETYPE_AUDIO_WEBM
+{
+    Text [ en-US ] = "Audio file" ;
+};
+
 String STR_SVT_MIMETYPE_IMAGE_GIF
 {
     Text [ en-US ] = "Graphics" ;
@@ -159,6 +164,11 @@ String STR_SVT_MIMETYPE_TEXT_VCARD
     Text [ en-US ] = "vCard file" ;
 };
 
+String STR_SVT_MIMETYPE_VIDEO_MSVIDEO
+{
+    Text [ en-US ] = "Video file" ;
+};
+
 String STR_SVT_MIMETYPE_VIDEO_THEORA
 {
     Text [ en-US ] = "Video file" ;
@@ -169,7 +179,7 @@ String STR_SVT_MIMETYPE_VIDEO_VDO
     Text [ en-US ] = "Video file" ;
 };
 
-String STR_SVT_MIMETYPE_VIDEO_MSVIDEO
+String STR_SVT_MIMETYPE_VIDEO_WEBM
 {
     Text [ en-US ] = "Video file" ;
 };