From 8b23cd3d73feddc9363e3c8ebf7409fe5031f47c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Jan 2018 11:52:16 +0000 Subject: Resolves: rhbz#1535541 fdo#88004 mimetypes are .macroEnabled not .macroenabled Change-Id: If7942ec9d4cd40f29fae2b9a8f76df1ef08bfc17 Reviewed-on: https://gerrit.libreoffice.org/48120 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- sysui/desktop/mimetypes/ms-excel-sheet-12.desktop | 2 +- sysui/desktop/mimetypes/ms-excel-sheet-12.keys | 2 +- sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop | 2 +- sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys | 2 +- sysui/desktop/mimetypes/ms-excel-template-12.desktop | 2 +- sysui/desktop/mimetypes/ms-excel-template-12.keys | 2 +- .../mimetypes/ms-powerpoint-presentation-12.desktop | 2 +- sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys | 2 +- sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop | 2 +- sysui/desktop/mimetypes/ms-powerpoint-template-12.keys | 2 +- sysui/desktop/mimetypes/ms-word-document-12.desktop | 2 +- sysui/desktop/mimetypes/ms-word-document-12.keys | 2 +- sysui/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 +++++++------- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'sysui/desktop/mimetypes') 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 -- cgit