filter/source/config/fragments/types/calc_MS_Excel_97.xcu | 2 - filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu | 2 - filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu | 2 - filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu | 2 - filter/source/config/fragments/types/writer_MS_Word_97.xcu | 2 - filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu | 2 - setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 14 +++++++--- sysui/desktop/mimetypes/ms-excel-sheet.desktop | 1 sysui/desktop/mimetypes/ms-excel-template-12.desktop | 1 sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop | 1 sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop | 1 sysui/desktop/mimetypes/ms-word-document.desktop | 1 sysui/desktop/mimetypes/ms-word-template-12.desktop | 1 13 files changed, 22 insertions(+), 10 deletions(-)
New commits: commit a1a63373f99a50eb0db0d8474e36278541d7c5cc Author: Jaskaran <[email protected]> Date: Wed Mar 9 00:24:08 2016 +0530 tdf#82335 Register Libreoffice for Kingsoft file types Registered LO for Kingsoft document , spreadsheet, presentation and their template types. Change-Id: If2b9f428b22f6d104c5ffe699f5264a22b814a0e Reviewed-on: https://gerrit.libreoffice.org/23037 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu index 3005279..547d309 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu @@ -18,7 +18,7 @@ <node oor:name="calc_MS_Excel_97" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.calc.ExcelBiffFormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>xls xlc xlm xlw xlk</value></prop> + <prop oor:name="Extensions"><value>xls xlc xlm xlw xlk et</value></prop> <prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>MS Excel 97</value></prop> diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu index 0dff79b..5bbe2c5 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu @@ -18,7 +18,7 @@ <node oor:name="calc_MS_Excel_97_VorlageTemplate" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.calc.ExcelBiffFormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>xlt</value></prop> + <prop oor:name="Extensions"><value>xlt ett</value></prop> <prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>MS Excel 97 Vorlage/Template</value></prop> diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu index f7766f4..3a84799 100644 --- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu +++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu @@ -18,7 +18,7 @@ <node oor:name="impress_MS_PowerPoint_97" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>ppt</value></prop> + <prop oor:name="Extensions"><value>ppt dps</value></prop> <prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>MS PowerPoint 97</value></prop> diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu index d28578f..314619d 100644 --- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu +++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu @@ -18,7 +18,7 @@ <node oor:name="impress_MS_PowerPoint_97_Vorlage" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>pot</value></prop> + <prop oor:name="Extensions"><value>pot dpt</value></prop> <prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>MS PowerPoint 97 Vorlage</value></prop> diff --git a/filter/source/config/fragments/types/writer_MS_Word_97.xcu b/filter/source/config/fragments/types/writer_MS_Word_97.xcu index c8e06f9..997a758 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_97.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_97.xcu @@ -18,7 +18,7 @@ <node oor:name="writer_MS_Word_97" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>doc</value></prop> + <prop oor:name="Extensions"><value>doc wps</value></prop> <prop oor:name="MediaType"><value>application/msword</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>MS Word 97</value></prop> diff --git a/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu index 29927d1..113d749 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu @@ -18,7 +18,7 @@ <node oor:name="writer_MS_Word_97_Vorlage" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dot</value></prop> + <prop oor:name="Extensions"><value>dot wpt</value></prop> <prop oor:name="MediaType"><value>application/msword</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>MS Word 97 Vorlage</value></prop> diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index ebd8d27..a32a494 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -35,6 +35,8 @@ static const CHAR* g_Extensions[] = { ".doc", // Microsoft Word Text [0] ".dot", // Microsoft Word Template + ".wps", // Kingsoft Writer Document + ".wpt", // Kingsoft Writer Template ".rtf", // rtf text ".docx", // Office Word 2007 XML document ".docm", // Office Word 2007 XML macro-enabled document @@ -48,6 +50,8 @@ static const CHAR* g_Extensions[] = ".xltx", // Office Excel 2007 XML template ".xltm", // Office Excel 2007 XML macro-enabled template ".xlsb", // Office Excel 2007 binary workbook (BIFF12) + ".et", // Kingsoft Spreadsheet + ".ett", // Kingsoft SpreadSheet Template ".ppt", // Microsoft Powerpoint ".pps", // Microsoft Powerpoint ".pot", // Microsoft Powerpoint Template @@ -56,16 +60,18 @@ static const CHAR* g_Extensions[] = ".potx", // Office PowerPoint 2007 XML template ".potm", // Office PowerPoint 2007 macro-enabled XML template ".ppsx", // Office PowerPoint 2007 XML show + ".dps", // Kingsoft Presentation + ".dpt", // Kingsoft Presentation Template ".vsd", // Visio 2000/XP/2003 document ".vst", // Visio 2000/XP/2003 template 0 }; static const int WORD_START = 0; -static const int EXCEL_START = 7; -static const int POWERPOINT_START = 15; -static const int VISIO_START = 23; -static const int VISIO_END = 25; +static const int EXCEL_START = 9; +static const int POWERPOINT_START = 19; +static const int VISIO_START = 29; +static const int VISIO_END = 31; // ".xlam", // Office Excel 2007 XML macro-enabled add-in // ".ppam", // Office PowerPoint 2007 macro-enabled XML add-in diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.desktop b/sysui/desktop/mimetypes/ms-excel-sheet.desktop index 6f81077..52c02a7 100644 --- a/sysui/desktop/mimetypes/ms-excel-sheet.desktop +++ b/sysui/desktop/mimetypes/ms-excel-sheet.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.xls +Patterns=*.et MimeType=application/vnd.ms-excel Comment=Microsoft Excel Worksheet diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.desktop b/sysui/desktop/mimetypes/ms-excel-template-12.desktop index 2b4a0f2..4499524 100644 --- a/sysui/desktop/mimetypes/ms-excel-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-excel-template-12.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.xltm +Patterns=*.ett MimeType=application/vnd.ms-excel.template.macroenabled.12 Comment=Microsoft Excel Worksheet Template diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop index 43da8c3..60afd56 100644 --- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop +++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.ppt +Patterns=*.dps MimeType=application/vnd.ms-powerpoint Comment=Microsoft PowerPoint Presentation diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop index a03a431..0b14170 100644 --- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.potm +Patterns=*.dpt MimeType=application/vnd.ms-powerpoint.template.macroenabled.12 Comment=Microsoft PowerPoint Presentation Template diff --git a/sysui/desktop/mimetypes/ms-word-document.desktop b/sysui/desktop/mimetypes/ms-word-document.desktop index e4c3ee4..756d21b 100644 --- a/sysui/desktop/mimetypes/ms-word-document.desktop +++ b/sysui/desktop/mimetypes/ms-word-document.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.doc +Patterns=*.wps MimeType=application/msword Comment=Microsoft Word Document diff --git a/sysui/desktop/mimetypes/ms-word-template-12.desktop b/sysui/desktop/mimetypes/ms-word-template-12.desktop index f16852a..1c6e25a 100644 --- a/sysui/desktop/mimetypes/ms-word-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-word-template-12.desktop @@ -22,5 +22,6 @@ Hidden=false Icon= Type=MimeType Patterns=*.dotm +Patterns=*.wpt MimeType=application/vnd.ms-word.template.macroenabled.12 Comment=Microsoft Word Document Template
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
