[Libreoffice-commits] core.git: 2 commits - basctl/source sfx2/source

[Rafael Lima (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |    3 +++
 sfx2/source/appl/sfxhelp.cxx        |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 24cc33655c7d54741c8b8d80244a285471558f0f
Author:     Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Fri Nov 25 20:57:45 2022 +0100
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Mon Nov 28 20:54:12 2022 +0100

    Make entry visible after scroll_to_row in Macro Organizer dialog
    
    Change-Id: I46b0f14a909e6c1813acfd9190459b5c87246682
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143263
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index 2cc12fb053d9..1c8fe9aec84d 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -142,6 +142,9 @@ void MacroChooser::StoreMacroDescription()
 
 void MacroChooser::RestoreMacroDescription()
 {
+    // The following call is a workaround to ensure the last used macro is 
scrolled to in kf5
+    m_xDialog->resize_to_request();
+
     EntryDescriptor aDesc;
     if (Shell* pShell = GetShell())
     {
commit c7b1fbff3673284d829606e5e07f9deb4258a5f5
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Nov 28 17:37:49 2022 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Nov 28 20:54:02 2022 +0100

    f'up to the tdf#152172 fix re Safari as default browser on Ventura
    
    Previous patch did only adjust the check in the rarely used version of
    the function, not in the primarily used signature. D'oh!
    
    Change-Id: I019a74651d3ee8bab43a8c3997b8cd05040b7ba4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143410
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index fe6350aa6f57..01b35d5ca0c9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -1291,7 +1291,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, 
weld::Widget* pWidget, const OUSt
                                     
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, pWidget);
             return true;
         }