[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - filter/source sysui/desktop

Sean Young sean at mess.org
Sat Jan 23 01:26:29 PST 2016


 filter/source/config/fragments/types/writer_MS_Write.xcu |    2 -
 sysui/desktop/debian/postinst                            |    1 
 sysui/desktop/macosx/Info.plist.in                       |   24 +++++++++++++++
 sysui/desktop/menus/writer.desktop                       |    2 -
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit f63fc6a723e0325cd9e78432d02e91bbb9de80b8
Author: Sean Young <sean at mess.org>
Date:   Thu Jan 14 20:13:45 2016 +0000

    Set file association for MS Write files on linux and Mac
    
    Other mime types used for MS Write are application/x-wri,
    application/mswrite and application/wri. I think these were
    pretty rare though.
    
    Change-Id: I2bf48ab7a2fb1d979db38774ae0547c5ab6040d4
    Reviewed-on: https://gerrit.libreoffice.org/21552
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Signed-off-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/filter/source/config/fragments/types/writer_MS_Write.xcu b/filter/source/config/fragments/types/writer_MS_Write.xcu
index f42dca6..48ae04b 100644
--- a/filter/source/config/fragments/types/writer_MS_Write.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Write.xcu
@@ -19,7 +19,7 @@
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MSWorksImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
         <prop oor:name="Extensions"><value>wri</value></prop>
-        <prop oor:name="MediaType"><value></value></prop>
+        <prop oor:name="MediaType"><value>application/x-mswrite</value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>MS_Write</value></prop>
         <prop oor:name="UIName">
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index b9b6f24..715403f 100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -176,6 +176,7 @@ application/x-wordperfect; %PREFIX -view %s
 application/wordperfect; %PREFIX -view %s
 application/vnd.lotus-wordpro; %PREFIX -view %s
 application/wpwin; %PREFIX -view %s
+application/x-mswrite; %PREFIX -view %s
 application/vnd.openofficeorg.extension; %PREFIX %s
 END
 
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 604a356..bd10c26 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1142,6 +1142,29 @@
                 <string>public.content</string>
             </array>
             <key>UTTypeDescription</key>
+            <string>Microsoft Write</string>
+            <key>UTTypeIdentifier</key>
+            <string>org.libreoffice.wri-document</string>
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>wri</string>
+                </array>
+                <key>public.mime-type</key>
+                <array>
+                    <string>application/x-mswrite</string>
+                </array>
+            </dict>
+        </dict>
+
+        <dict>
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.data</string>
+                <string>public.content</string>
+            </array>
+            <key>UTTypeDescription</key>
             <string>Data Interchange Format</string>
             <key>UTTypeIdentifier</key>
             <string>org.libreoffice.dif-document</string>
@@ -1782,6 +1805,7 @@
                 <string>org.libreoffice.wpd-document</string>
                 <string>org.libreoffice.hwp-document</string>
                 <string>org.libreoffice.wks-document</string>
+                <string>org.libreoffice.wri-document</string>
                 <string>org.libreoffice.dif-document</string>
                 <string>org.libreoffice.slk-document</string>
                 <string>org.libreoffice.csv-document</string>
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 1df1b49..68ec858 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;applicatio
 n/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;
+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;applicatio
 n/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;
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.


More information about the Libreoffice-commits mailing list