[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - sysui/desktop

[Thorsten Behrens (via logerrit)]

 sysui/desktop/macosx/Info.plist.in      |   17 +++++++++++++++++
 sysui/desktop/menus/startcenter.desktop |    2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 883930f7e8164043cb395652c3afc42265a8d2f5
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Sat Dec 19 11:18:34 2020 +0100
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Thu Jul 22 14:32:00 2021 +0200

    Handle fancy webdav URI schemes on all platforms
    
    Change-Id: I5cc16b0fdaf032e90aa0361df6f33c04a615abab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108016
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    (cherry picked from commit 1bc454a2c0cb0dd69512d69ddd2123a44814197e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117812
    (cherry picked from commit 3156e46277822ec7fbd2e93482a6c576e06b728a)

diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index fa3dbed3c79c..7a3f9a6dce31 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1463,6 +1463,14 @@
                 <string>vnd.libreoffice.cmis</string>
             </array>
         </dict>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>@PRODUCTNAME@</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>vnd.libreoffice.command</string>
+            </array>
+        </dict>
         <dict>
             <key>CFBundleURLName</key>
             <string>@PRODUCTNAME@ WebDav</string>
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 3551a750a45f..be551ae27335 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -23,7 +23,7 @@ Icon=startcenter
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
 Exec=${UNIXBASISROOTNAME} %%FILE%%
-MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;
+MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;x-scheme-handler/vnd.sun.star.webdav;x-scheme-handler/vnd.sun.star.webdavs;x-scheme-handler/vnd.libreoffice.command;
 Name=%PRODUCTNAME
 GenericName=Office
 Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation.
commit e7d7fc049b3824984f353bab18525a0e4683b009
Author:     Eivind Samseth <eisa01 at gmail.com>
AuthorDate: Sat May 16 14:39:33 2020 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Thu Jul 22 14:31:39 2021 +0200

    tdf#103644: Add support for vnd.sun.star.webdav on macOS
    
    Change-Id: I0766b7a12686c829f8b0fe43df6d5256139d4f10
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94359
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 32eac748c508640bec036975c0a91ea904c729a2)

diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 608140d2911d..fa3dbed3c79c 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1463,6 +1463,15 @@
                 <string>vnd.libreoffice.cmis</string>
             </array>
         </dict>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>@PRODUCTNAME@ WebDav</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>vnd.sun.star.webdav</string>
+				<string>vnd.sun.star.webdavs</string>
+            </array>
+        </dict>
     </array>
 
     <key>CFBundleDocumentTypes</key>