summaryrefslogtreecommitdiff
path: root/sysui/desktop/mandriva
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-16 14:55:45 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-16 14:55:45 +0000
commitcb5fe635669622737ea7512fe5c5da89202b8c2e (patch)
treefd57b82af83af3c688cf975b96ac407b68736734 /sysui/desktop/mandriva
parent94e967478950915c0c019bad85e2b66f6a646d0b (diff)
INTEGRATION: CWS sysui26 (1.21.2); FILE MERGED
2008/07/03 18:36:25 ihi 1.21.2.2: #i91338# gnome mimetype fix 2008/06/27 13:04:28 ihi 1.21.2.1: #i89966# New OOXML mimetypes
Diffstat (limited to 'sysui/desktop/mandriva')
-rw-r--r--sysui/desktop/mandriva/mandriva-menus.spec24
1 files changed, 24 insertions, 0 deletions
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index 6430519860e6..de093a217e1a 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -83,6 +83,18 @@ application/vnd.sun.xml.math sxm
application/vnd.stardivision.math smf
application/vnd.sun.xml.base odb
application/vnd.openofficeorg.extension oxt
+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
+application/vnd.ms-word.document.macroenabled.12 docm
+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
+application/vnd.ms-word.template.macroenabled.12 dotm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
+application/vnd.ms-excel.sheet.macroenabled.12 xlsm
+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
+application/vnd.ms-excel.template.macroenabled.12 xltm
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm
+application/vnd.openxmlformats-officedocument.presentationml.template potx
+application/vnd.ms-powerpoint.template.macroenabled.12 potm
END
# and replace the original file
@@ -156,6 +168,18 @@ application/x-stardraw; %unixfilename -view %s
application/vnd.oasis.opendocument.database; %unixfilename -view %s
application/vnd.sun.xml.base; %unixfilename -view %s
application/vnd.openofficeorg.extension; %unixfilename %s
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s
+application/vnd.ms-word.document.macroenabled.12;%unixfilename -view %s
+application/vnd.openxmlformats-officedocument.wordprocessingml.template; %unixfilename -view %s
+application/vnd.ms-word.template.macroenabled.12; %unixfilename -view %s
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; %unixfilename -view %s
+application/vnd.ms-excel.sheet.macroenabled.12; %unixfilename -view %s
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; %unixfilename -view %s
+application/vnd.ms-excel.template.macroenabled.12; %unixfilename -view %s
+application/vnd.openxmlformats-officedocument.presentationml.presentation; %unixfilename -view %s
+application/vnd.ms-powerpoint.presentation.macroenabled.12; %unixfilename -view %s
+application/vnd.openxmlformats-officedocument.presentationml.template; %unixfilename -view %s
+application/vnd.ms-powerpoint.template.macroenabled.12; %unixfilename -view %s
END
# and replace the original file