sfx2/source/appl/sfxhelp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 588c40b3a16008bfcfe6bb75e009faecaefccb7d
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Nov 23 14:55:19 2022 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Nov 23 20:20:14 2022 +0100

    tdf#152172 fix help workaround re Safari as default browser on Ventura
    
    the "Rapid Security Response" feature added with macOS 13 (Ventura)
    makes Safari a stub in a different location. Instead of the traditional
    /Application/Safari.app/ the call to query the default app will return
    /System/Volumes/Preboot/Cryptexes/App/System/Applications/Safari.app/
    So instead of a full match, just check for the suffix.
    
    Change-Id: Ic4abfe33c118827bc0e089e9966e57a0fd8c0526
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143178
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    (cherry picked from commit e5d9db623882c7a9d88d40d5bf2bce0dbdb11365)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143158
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d11c99b30b12..bcea21952dc5 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -1122,7 +1122,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow)
                                     
static_cast<CFStringRef>(@"https://www.libreoffice.org";),
                                     nullptr),
                                 kLSRolesAll, nullptr);
-        if([static_cast<NSString*>(CFURLGetString(pBrowser)) 
isEqualToString:@"file:///Applications/Safari.app/"]) {
+        if([static_cast<NSString*>(CFURLGetString(pBrowser)) 
hasSuffix:@"/Applications/Safari.app/"]) {
             impl_showOnlineHelp(aHelpURL, pWeldWindow);
             return true;
         }

Reply via email to