summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-16 14:59:45 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-16 14:59:45 +0000
commit927b6bd147db980dd395c92da4089e9f6a8ed8ab (patch)
treea1210f7f6d4b0c583a20a21eb70fe5d7d8295065 /sysui/desktop
parent5aad1b990aecebccf787f4f48725a091c1e16578 (diff)
INTEGRATION: CWS sysui26 (1.5.294); FILE MERGED
2008/07/03 18:36:27 ihi 1.5.294.2: #i91338# gnome mimetype fix 2008/06/27 14:06:39 ihi 1.5.294.1: #i89966# New OOXML mimetypes
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/mimetypes/openoffice.mime36
1 files changed, 36 insertions, 0 deletions
diff --git a/sysui/desktop/mimetypes/openoffice.mime b/sysui/desktop/mimetypes/openoffice.mime
index cb6800062e67..9e256b00a055 100644
--- a/sysui/desktop/mimetypes/openoffice.mime
+++ b/sysui/desktop/mimetypes/openoffice.mime
@@ -33,3 +33,39 @@ application/vnd.oasis.opendocument.formula:
application/vnd.sun.xml.base:
ext: odb
+
+application/vnd.openxmlformats-officedocument.wordprocessingml.document
+ ext: docx
+
+application/vnd.ms-word.document.macroenabled.12
+ ext: docm
+
+application/vnd.openxmlformats-officedocument.wordprocessingml.template
+ ext: dotx
+
+application/vnd.ms-word.template.macroenabled.12
+ ext: dotm
+
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+ ext: xlsx
+
+application/vnd.ms-excel.sheet.macroenabled.12
+ ext: xlsm
+
+application/vnd.openxmlformats-officedocument.spreadsheetml.template
+ ext: xltx
+
+application/vnd.ms-excel.template.macroenabled.12
+ ext: xltm
+
+application/vnd.openxmlformats-officedocument.presentationml.presentation
+ ext: pptx
+
+application/vnd.ms-powerpoint.presentation.macroenabled.12
+ ext: pptm
+
+application/vnd.openxmlformats-officedocument.presentationml.template
+ ext: potx
+
+application/vnd.ms-powerpoint.template.macroenabled.12
+ ext: potm