[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - discovery.xml

[Andras Timar (via logerrit)]

 discovery.xml |   18 ------------------
 1 file changed, 18 deletions(-)

New commits:
commit 523824252a7dc8ba97c82ae8ff8e37912bd28777
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jun 26 10:59:12 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 11:30:24 2020 +0200

    existing integrations prefer text/rtf
    
    Change-Id: Ia85c198178d6c3f579d69bb7df3b131ffcaa4847

diff --git a/discovery.xml b/discovery.xml
index 95c346240..b694f97d3 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -251,7 +251,7 @@
         <app name="application/x-pagemaker">
             <action name="view" default="true" ext="p65"/>
         </app>
-        <app name="application/rtf">
+        <app name="text/rtf">
             <action name="edit" default="true" ext="rtf"/>
         </app>
         <app name="text/plain">
commit aae7f281d0189160e746d4af42cc544c7e5da620
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jun 25 11:59:50 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 11:29:41 2020 +0200

    Remove duplicating extensions from discovery
    
    Fixes the problem that binding with SharePoint using New-SPWOPIBinding
    is only possible when specific extensions or applications are specified.
    Trying to bind all information from discovery resulted in error:
    
        New-SPWOPIBinding : One or more of the WOPI bindings specified in
        New-SPWOPIBinding already exist. The operation has been cancelled.
    
    Change-Id: I5675c4cee8b68b81b5c0971a5dc577f653a1ae5b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97063
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/discovery.xml b/discovery.xml
index 0f114c095..95c346240 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -254,9 +254,6 @@
         <app name="application/rtf">
             <action name="edit" default="true" ext="rtf"/>
         </app>
-        <app name="text/rtf">
-            <action name="edit" default="true" ext="rtf"/>
-        </app>
         <app name="text/plain">
             <action name="edit" default="true" ext="txt"/>
         </app>
@@ -266,15 +263,9 @@
         <app name="application/clarisworks">
             <action name="view" default="true" ext="cwk"/>
         </app>
-        <app name="application/vnd.corel-draw">
-            <action name="view" default="true" ext="cdr"/>
-        </app>
         <app name="image/x-wpg">
             <action name="view" default="true" ext="wpg"/>
         </app>
-        <app name="application/prs.plucker">
-            <action name="view" default="true" ext="pdb"/>
-        </app>
         <app name="application/x-iwork-pages-sffpages">
             <action name="view" default="true" ext="pages"/>
         </app>
@@ -290,21 +281,12 @@
         <app name="image/x-freehand">
             <action name="view" default="true" ext="fh"/>
         </app>
-        <app name="application/vnd.palm">
-            <action name="view" default="true" ext="pdb"/>
-        </app>
         <app name="application/vnd.sun.xml.chart">
             <action name="view" default="true" ext="sxs"/>
         </app>
-        <app name="application/vnd.sun.xml.writer.web">
-            <action name="view" default="true" ext="stw"/>
-        </app>
         <app name="application/x-t602">
             <action name="view" default="true" ext="602"/>
         </app>
-        <app name="application/vnd.sun.xml.report.chart">
-            <action name="edit" default="true" ext="odc"/>
-        </app>
         <app name="image/bmp">
             <action name="view" ext="bmp"/>
         </app>