dc0b3e
From 0948ea6d8d487bfe6d379ef11ecfc3643b050ddc Mon Sep 17 00:00:00 2001
dc0b3e
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
dc0b3e
Date: Thu, 18 Jan 2018 11:52:16 +0000
dc0b3e
Subject: [PATCH] Resolves: rhbz#1535541 fdo#88004 mimetypes are .macroEnabled
dc0b3e
 not .macroenabled
dc0b3e
dc0b3e
Change-Id: If7942ec9d4cd40f29fae2b9a8f76df1ef08bfc17
dc0b3e
Reviewed-on: https://gerrit.libreoffice.org/48120
dc0b3e
Reviewed-by: Michael Stahl <mstahl@redhat.com>
dc0b3e
Tested-by: Michael Stahl <mstahl@redhat.com>
dc0b3e
---
dc0b3e
 sysui/desktop/freedesktop/freedesktop-menus.spec   | 24 +++++++++----------
dc0b3e
 sysui/desktop/macosx/Info.plist.in                 | 28 +++++++++++-----------
dc0b3e
 sysui/desktop/menus/calc.desktop                   |  2 +-
dc0b3e
 sysui/desktop/menus/impress.desktop                |  2 +-
dc0b3e
 sysui/desktop/menus/writer.desktop                 |  2 +-
dc0b3e
 sysui/desktop/mimetypes/ms-excel-sheet-12.desktop  |  2 +-
dc0b3e
 sysui/desktop/mimetypes/ms-excel-sheet-12.keys     |  2 +-
dc0b3e
 .../mimetypes/ms-excel-sheet-binary-12.desktop     |  2 +-
dc0b3e
 .../mimetypes/ms-excel-sheet-binary-12.keys        |  2 +-
dc0b3e
 .../desktop/mimetypes/ms-excel-template-12.desktop |  2 +-
dc0b3e
 sysui/desktop/mimetypes/ms-excel-template-12.keys  |  2 +-
dc0b3e
 .../ms-powerpoint-presentation-12.desktop          |  2 +-
dc0b3e
 .../mimetypes/ms-powerpoint-presentation-12.keys   |  2 +-
dc0b3e
 .../mimetypes/ms-powerpoint-template-12.desktop    |  2 +-
dc0b3e
 .../mimetypes/ms-powerpoint-template-12.keys       |  2 +-
dc0b3e
 .../desktop/mimetypes/ms-word-document-12.desktop  |  2 +-
dc0b3e
 sysui/desktop/mimetypes/ms-word-document-12.keys   |  2 +-
dc0b3e
 .../desktop/mimetypes/ms-word-template-12.desktop  |  2 +-
dc0b3e
 sysui/desktop/mimetypes/ms-word-template-12.keys   |  2 +-
dc0b3e
 sysui/desktop/mimetypes/openoffice.applications    |  2 +-
dc0b3e
 sysui/desktop/mimetypes/openoffice.mime            | 14 +++++------
dc0b3e
 sysui/desktop/solaris/mime.types                   | 12 +++++-----
dc0b3e
 22 files changed, 57 insertions(+), 57 deletions(-)
dc0b3e
dc0b3e
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
dc0b3e
index 9c952a50ff01..68fa32293c45 100755
dc0b3e
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
dc0b3e
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
dc0b3e
@@ -231,17 +231,17 @@ application/vnd.sun.xml.base odb
dc0b3e
 application/vnd.stardivision.math smf
dc0b3e
 application/vnd.openofficeorg.extension oxt
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
dc0b3e
-application/vnd.ms-word.document.macroenabled.12 docm
dc0b3e
+application/vnd.ms-word.document.macroEnabled.12 docm
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
dc0b3e
-application/vnd.ms-word.template.macroenabled.12 dotm
dc0b3e
+application/vnd.ms-word.template.macroEnabled.12 dotm
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
dc0b3e
-application/vnd.ms-excel.sheet.macroenabled.12 xlsm
dc0b3e
+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
dc0b3e
-application/vnd.ms-excel.template.macroenabled.12 xltm
dc0b3e
+application/vnd.ms-excel.template.macroEnabled.12 xltm
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
dc0b3e
-application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm
dc0b3e
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.template potx
dc0b3e
-application/vnd.ms-powerpoint.template.macroenabled.12 potm
dc0b3e
+application/vnd.ms-powerpoint.template.macroEnabled.12 potm
dc0b3e
 END
dc0b3e
 
dc0b3e
 # and replace the original file
dc0b3e
@@ -320,17 +320,17 @@ application/vnd.oasis.opendocument.database; %unixfilename -view %s
dc0b3e
 application/vnd.sun.xml.base; %unixfilename -view %s
dc0b3e
 application/vnd.openofficeorg.extension; %unixfilename %s
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; %unixfilename -view %s
dc0b3e
-application/vnd.ms-word.document.macroenabled.12;%unixfilename -view %s
dc0b3e
+application/vnd.ms-word.document.macroEnabled.12;%unixfilename -view %s
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.template; %unixfilename -view %s
dc0b3e
-application/vnd.ms-word.template.macroenabled.12; %unixfilename -view %s
dc0b3e
+application/vnd.ms-word.template.macroEnabled.12; %unixfilename -view %s
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; %unixfilename -view %s
dc0b3e
-application/vnd.ms-excel.sheet.macroenabled.12; %unixfilename -view %s
dc0b3e
+application/vnd.ms-excel.sheet.macroEnabled.12; %unixfilename -view %s
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.template; %unixfilename -view %s
dc0b3e
-application/vnd.ms-excel.template.macroenabled.12; %unixfilename -view %s
dc0b3e
+application/vnd.ms-excel.template.macroEnabled.12; %unixfilename -view %s
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.presentation; %unixfilename -view %s
dc0b3e
-application/vnd.ms-powerpoint.presentation.macroenabled.12; %unixfilename -view %s
dc0b3e
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; %unixfilename -view %s
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.template; %unixfilename -view %s
dc0b3e
-application/vnd.ms-powerpoint.template.macroenabled.12; %unixfilename -view %s
dc0b3e
+application/vnd.ms-powerpoint.template.macroEnabled.12; %unixfilename -view %s
dc0b3e
 END
dc0b3e
 
dc0b3e
   # and replace the original file
dc0b3e
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
dc0b3e
index 75980deef9e6..608140d2911d 100755
dc0b3e
--- a/sysui/desktop/macosx/Info.plist.in
dc0b3e
+++ b/sysui/desktop/macosx/Info.plist.in
dc0b3e
@@ -779,7 +779,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML word processing document (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.wordprocessingml.document.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.wordprocessingml.document.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -824,7 +824,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML word processing template (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.wordprocessingml.template.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.wordprocessingml.template.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -871,7 +871,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML spreadsheet template (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.spreadsheetml.template.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.spreadsheetml.template.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -916,7 +916,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Microsoft Excel 2007 spreadsheet (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>com.microsoft.excel.sheet.binary.macroenabled</string>
dc0b3e
+            <string>com.microsoft.excel.sheet.binary.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -939,7 +939,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML spreadsheet (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.spreadsheetml.sheet.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.spreadsheetml.sheet.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -986,7 +986,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML presentation (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.presentationml.presentation.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.presentationml.presentation.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -1032,7 +1032,7 @@
dc0b3e
             <key>UTTypeDescription</key>
dc0b3e
             <string>Office Open XML presentation template (macros enabled)</string>
dc0b3e
             <key>UTTypeIdentifier</key>
dc0b3e
-            <string>org.openxmlformats.presentationml.template.macroenabled</string>
dc0b3e
+            <string>org.openxmlformats.presentationml.template.macroEnabled</string>
dc0b3e
             <key>UTTypeTagSpecification</key>
dc0b3e
             <dict>
dc0b3e
                 <key>public.filename-extension</key>
dc0b3e
@@ -1789,18 +1789,18 @@
dc0b3e
                 <string>com.microsoft.excel.xls</string>
dc0b3e
                 <string>com.microsoft.powerpoint.ppt</string>
dc0b3e
                 <string>org.openxmlformats.wordprocessingml.document</string>
dc0b3e
-                <string>org.openxmlformats.wordprocessingml.document.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.wordprocessingml.document.macroEnabled</string>
dc0b3e
                 <string>org.openxmlformats.wordprocessingml.template</string>
dc0b3e
-                <string>org.openxmlformats.wordprocessingml.template.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.wordprocessingml.template.macroEnabled</string>
dc0b3e
                 <string>org.openxmlformats.spreadsheetml.sheet</string>
dc0b3e
-                <string>org.openxmlformats.spreadsheetml.sheet.macroenabled</string>
dc0b3e
-                <string>com.microsoft.excel.sheet.binary.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.spreadsheetml.sheet.macroEnabled</string>
dc0b3e
+                <string>com.microsoft.excel.sheet.binary.macroEnabled</string>
dc0b3e
                 <string>org.openxmlformats.spreadsheetml.template</string>
dc0b3e
-                <string>org.openxmlformats.spreadsheetml.template.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.spreadsheetml.template.macroEnabled</string>
dc0b3e
                 <string>org.openxmlformats.presentationml.presentation</string>
dc0b3e
-                <string>org.openxmlformats.presentationml.presentation.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.presentationml.presentation.macroEnabled</string>
dc0b3e
                 <string>org.openxmlformats.presentationml.template</string>
dc0b3e
-                <string>org.openxmlformats.presentationml.template.macroenabled</string>
dc0b3e
+                <string>org.openxmlformats.presentationml.template.macroEnabled</string>
dc0b3e
                 <string>org.libreoffice.pdb-document</string>
dc0b3e
                 <string>org.libreoffice.wpd-document</string>
dc0b3e
                 <string>org.libreoffice.hwp-document</string>
dc0b3e
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
dc0b3e
index dac071a17d53..8b147cc3f5bd 100644
dc0b3e
--- a/sysui/desktop/menus/calc.desktop
dc0b3e
+++ b/sysui/desktop/menus/calc.desktop
dc0b3e
@@ -22,7 +22,7 @@ Icon=calc
dc0b3e
 Type=Application
dc0b3e
 Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
dc0b3e
 Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
dc0b3e
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc;
dc0b3e
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc;
dc0b3e
 Name=%PRODUCTNAME Calc
dc0b3e
 GenericName=Spreadsheet
dc0b3e
 Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
dc0b3e
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
dc0b3e
index e728eabe3490..e29706127611 100644
dc0b3e
--- a/sysui/desktop/menus/impress.desktop
dc0b3e
+++ b/sysui/desktop/menus/impress.desktop
dc0b3e
@@ -22,7 +22,7 @@ Icon=impress
dc0b3e
 Type=Application
dc0b3e
 Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
dc0b3e
 Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
dc0b3e
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
dc0b3e
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
dc0b3e
 Name=%PRODUCTNAME Impress
dc0b3e
 GenericName=Presentation
dc0b3e
 Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
dc0b3e
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
dc0b3e
index 8b995a58257e..21d59b8278a0 100644
dc0b3e
--- a/sysui/desktop/menus/writer.desktop
dc0b3e
+++ b/sysui/desktop/menus/writer.desktop
dc0b3e
@@ -22,7 +22,7 @@ Icon=writer
dc0b3e
 Type=Application
dc0b3e
 Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
dc0b3e
 Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
dc0b3e
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-starwriter;
dc0b3e
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroEnabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-starwriter;
dc0b3e
 Name=%PRODUCTNAME Writer
dc0b3e
 GenericName=Word Processor
dc0b3e
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
dc0b3e
index a3bd5b90f029..51662e973744 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.xlsm
dc0b3e
-MimeType=application/vnd.ms-excel.sheet.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-excel.sheet.macroEnabled.12
dc0b3e
 Comment=Microsoft Excel Worksheet
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
dc0b3e
index be746d9ad8ed..bbe182eba144 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-excel.sheet.macroenabled.12
dc0b3e
+application/vnd.ms-excel.sheet.macroEnabled.12
dc0b3e
 	description=Microsoft Excel Worksheet
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
dc0b3e
index 1373cb894066..5eeaba43819e 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.xlsb
dc0b3e
-MimeType=application/vnd.ms-excel.sheet.binary.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-excel.sheet.binary.macroEnabled.12
dc0b3e
 Comment=Microsoft Excel Worksheet
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
dc0b3e
index 091cff6214ef..fb90ffb2bbaa 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-excel.sheet.binary.macroenabled.12
dc0b3e
+application/vnd.ms-excel.sheet.binary.macroEnabled.12
dc0b3e
 	description=Microsoft Excel Worksheet
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.desktop b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
dc0b3e
index 2b4a0f254c97..921f35e7bcc8 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-template-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.xltm
dc0b3e
-MimeType=application/vnd.ms-excel.template.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-excel.template.macroEnabled.12
dc0b3e
 Comment=Microsoft Excel Worksheet Template
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.keys b/sysui/desktop/mimetypes/ms-excel-template-12.keys
dc0b3e
index 8eb36cc1b229..107dfa2fff66 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-excel-template-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-excel-template-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-excel.template.macroenabled.12
dc0b3e
+application/vnd.ms-excel.template.macroEnabled.12
dc0b3e
 	description=Microsoft Excel Worksheet Template
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
dc0b3e
index b779584211f7..dfa926d1d417 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.pptm
dc0b3e
-MimeType=application/vnd.ms-powerpoint.presentation.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-powerpoint.presentation.macroEnabled.12
dc0b3e
 Comment=Microsoft PowerPoint Presentation
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
dc0b3e
index 2e86010f4b7d..3ec7201fe5e9 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-powerpoint.presentation.macroenabled.12
dc0b3e
+application/vnd.ms-powerpoint.presentation.macroEnabled.12
dc0b3e
 	description=Microsoft PowerPoint Presentation
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
dc0b3e
index a03a43185859..400acb773dd9 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.potm
dc0b3e
-MimeType=application/vnd.ms-powerpoint.template.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-powerpoint.template.macroEnabled.12
dc0b3e
 Comment=Microsoft PowerPoint Presentation Template
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
dc0b3e
index 07f25626936f..3084f8dfd589 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-powerpoint.template.macroenabled.12
dc0b3e
+application/vnd.ms-powerpoint.template.macroEnabled.12
dc0b3e
 	description=Microsoft PowerPoint Presentation Template
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-word-document-12.desktop b/sysui/desktop/mimetypes/ms-word-document-12.desktop
dc0b3e
index 10ed72002410..dfe2a92730fe 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-word-document-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-word-document-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.docm
dc0b3e
-MimeType=application/vnd.ms-word.document.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-word.document.macroEnabled.12
dc0b3e
 Comment=Microsoft Word Document
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-word-document-12.keys b/sysui/desktop/mimetypes/ms-word-document-12.keys
dc0b3e
index 456564c1a126..53b8f95f1aad 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-word-document-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-word-document-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-word.document.macroenabled.12
dc0b3e
+application/vnd.ms-word.document.macroEnabled.12
dc0b3e
 	description=Microsoft Word Document
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.desktop b/sysui/desktop/mimetypes/ms-word-template-12.desktop
dc0b3e
index f16852aee9d8..c6fcb745aa6b 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-word-template-12.desktop
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-word-template-12.desktop
dc0b3e
@@ -22,5 +22,5 @@ Hidden=false
dc0b3e
 Icon=
dc0b3e
 Type=MimeType
dc0b3e
 Patterns=*.dotm
dc0b3e
-MimeType=application/vnd.ms-word.template.macroenabled.12
dc0b3e
+MimeType=application/vnd.ms-word.template.macroEnabled.12
dc0b3e
 Comment=Microsoft Word Document Template
dc0b3e
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.keys b/sysui/desktop/mimetypes/ms-word-template-12.keys
dc0b3e
index 8b49db70151f..c3d398813d90 100644
dc0b3e
--- a/sysui/desktop/mimetypes/ms-word-template-12.keys
dc0b3e
+++ b/sysui/desktop/mimetypes/ms-word-template-12.keys
dc0b3e
@@ -1,4 +1,4 @@
dc0b3e
-application/vnd.ms-word.template.macroenabled.12
dc0b3e
+application/vnd.ms-word.template.macroEnabled.12
dc0b3e
 	description=Microsoft Word Document Template
dc0b3e
 	default_action_type=application
dc0b3e
 	short_list_application_ids_for_novice_user_level=
dc0b3e
diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications
dc0b3e
index 8af25f65bf07..c75498df4544 100755
dc0b3e
--- a/sysui/desktop/mimetypes/openoffice.applications
dc0b3e
+++ b/sysui/desktop/mimetypes/openoffice.applications
dc0b3e
@@ -5,5 +5,5 @@ OFFICENAME
dc0b3e
 	expects_uris=true
dc0b3e
 	requires_terminal=false
dc0b3e
 	uses_gnomevfs=true
dc0b3e
-	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.text-master-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet;
dc0b3e
+	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.text-master-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/x-hwp;text/spreadsheet;
dc0b3e
 
dc0b3e
diff --git a/sysui/desktop/mimetypes/openoffice.mime b/sysui/desktop/mimetypes/openoffice.mime
dc0b3e
index fc895cf64829..63b53e7ba840 100755
dc0b3e
--- a/sysui/desktop/mimetypes/openoffice.mime
dc0b3e
+++ b/sysui/desktop/mimetypes/openoffice.mime
dc0b3e
@@ -49,40 +49,40 @@ application/vnd.sun.xml.base:
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.document
dc0b3e
     ext: docx
dc0b3e
 
dc0b3e
-application/vnd.ms-word.document.macroenabled.12
dc0b3e
+application/vnd.ms-word.document.macroEnabled.12
dc0b3e
     ext: docm
dc0b3e
 
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.template
dc0b3e
     ext: dotx
dc0b3e
 
dc0b3e
-application/vnd.ms-word.template.macroenabled.12
dc0b3e
+application/vnd.ms-word.template.macroEnabled.12
dc0b3e
     ext: dotm
dc0b3e
 
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
dc0b3e
     ext: xlsx
dc0b3e
 
dc0b3e
-application/vnd.ms-excel.sheet.macroenabled.12
dc0b3e
+application/vnd.ms-excel.sheet.macroEnabled.12
dc0b3e
     ext: xlsm
dc0b3e
 
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.template
dc0b3e
     ext: xltx
dc0b3e
     
dc0b3e
-application/vnd.ms-excel.template.macroenabled.12
dc0b3e
+application/vnd.ms-excel.template.macroEnabled.12
dc0b3e
     ext: xltm
dc0b3e
     
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.presentation
dc0b3e
     ext: pptx
dc0b3e
     
dc0b3e
-application/vnd.ms-powerpoint.presentation.macroenabled.12
dc0b3e
+application/vnd.ms-powerpoint.presentation.macroEnabled.12
dc0b3e
     ext: pptm
dc0b3e
     
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.template
dc0b3e
     ext: potx
dc0b3e
     
dc0b3e
-application/vnd.ms-powerpoint.template.macroenabled.12
dc0b3e
+application/vnd.ms-powerpoint.template.macroEnabled.12
dc0b3e
     ext: potm
dc0b3e
 
dc0b3e
-application/vnd.ms-excel.sheet.binary.macroenabled.12
dc0b3e
+application/vnd.ms-excel.sheet.binary.macroEnabled.12
dc0b3e
     ext: xlsb
dc0b3e
 
dc0b3e
 application/vnd.ms-word
dc0b3e
diff --git a/sysui/desktop/solaris/mime.types b/sysui/desktop/solaris/mime.types
dc0b3e
index a5ee6838a9a9..1e10ad1829c4 100755
dc0b3e
--- a/sysui/desktop/solaris/mime.types
dc0b3e
+++ b/sysui/desktop/solaris/mime.types
dc0b3e
@@ -65,17 +65,17 @@ application/vnd.stardivision.math smf
dc0b3e
 application/vnd.sun.xml.base odb
dc0b3e
 application/vnd.openofficeorg.extension oxt
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
dc0b3e
-application/vnd.ms-word.document.macroenabled.12 docm
dc0b3e
+application/vnd.ms-word.document.macroEnabled.12 docm
dc0b3e
 application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
dc0b3e
-application/vnd.ms-word.template.macroenabled.12 dotm
dc0b3e
+application/vnd.ms-word.template.macroEnabled.12 dotm
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
dc0b3e
-application/vnd.ms-excel.sheet.macroenabled.12 xlsm
dc0b3e
+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
dc0b3e
 application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
dc0b3e
-application/vnd.ms-excel.template.macroenabled.12 xltm
dc0b3e
+application/vnd.ms-excel.template.macroEnabled.12 xltm
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
dc0b3e
-application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm
dc0b3e
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
dc0b3e
 application/vnd.openxmlformats-officedocument.presentationml.template potx
dc0b3e
-application/vnd.ms-powerpoint.template.macroenabled.12 potm
dc0b3e
+application/vnd.ms-powerpoint.template.macroEnabled.12 potm
dc0b3e
 END
dc0b3e
 else
dc0b3e
 cat ${PKG_INSTALL_ROOT}/etc/mime.types
dc0b3e
-- 
dc0b3e
2.14.3
dc0b3e