summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-16 15:02:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-16 15:02:55 +0000
commitb244e8661dc60d33fc81c0ff822b7b4879667428 (patch)
treee3f668cea92c968841c9261c38730e5b9c28f651 /sysui/desktop
parentf3834a493cc2d6d8c589d26c696d57b1f611a1fa (diff)
INTEGRATION: CWS sysui26 (1.27.2); FILE MERGED
2008/07/04 13:37:12 ihi 1.27.2.2: #i91338# Added missing mimetype 2008/06/27 13:41:36 ihi 1.27.2.1: #i89966# New OOXML mimetypes
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/share/makefile.mk15
1 files changed, 14 insertions, 1 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 877dd55e27..73157bd2c1 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.27 $
+# $Revision: 1.28 $
#
# This file is part of OpenOffice.org.
#
@@ -84,6 +84,19 @@ MIMELIST = \
oasis-master-document \
oasis-database \
oasis-web-template \
+ ms-excel-sheet-12 \
+ ms-excel-template-12 \
+ ms-powerpoint-presentation-12 \
+ ms-powerpoint-template-12 \
+ ms-word-document-12 \
+ ms-word-template-12 \
+ openxmlformats-officedocument-presentationml-presentation \
+ openxmlformats-officedocument-presentationml-template \
+ openxmlformats-officedocument-spreadsheetml-sheet \
+ openxmlformats-officedocument-spreadsheetml-template \
+ openxmlformats-officedocument-wordprocessingml-document \
+ openxmlformats-officedocument-wordprocessingml-template \
+ ms-excel-sheet-binary-12 \
extension
MIMEICONLIST = \