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