configure.ac                 |    2 +-
 sfx2/source/appl/sfxhelp.cxx |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3d0a97f9bd8e502213f28f6e0529471674b94a8b
Author:     Andras Timar <[email protected]>
AuthorDate: Fri Jan 19 17:40:17 2024 +0100
Commit:     Andras Timar <[email protected]>
CommitDate: Fri Jan 19 17:40:17 2024 +0100

    Bump version to 23.05.7.5
    
    Change-Id: Icf72735d18c35ddfc320459eaa9c04a759882b1f

diff --git a/configure.ac b/configure.ac
index 017d4baf0699..068e79a9ab5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.7.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.7.5],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 88fea772610a4feef018ba03fd19749841772225
Author:     Andras Timar <[email protected]>
AuthorDate: Fri Jan 19 15:49:49 2024 +0100
Commit:     Andras Timar <[email protected]>
CommitDate: Fri Jan 19 15:49:49 2024 +0100

    LOK: disable popup bubble for hyperlinks
    
    Change-Id: I0ca21a90561affa453bd249c86e58793618f809e

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 01b35d5ca0c9..0f27e631a20c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -670,6 +670,10 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, 
const weld::Widget* p
 
 OUString SfxHelp::GetURLHelpText(std::u16string_view aURL)
 {
+    // hyperlinks are handled differently in Online
+    if (comphelper::LibreOfficeKit::isActive())
+        return OUString();
+
     bool bCtrlClickHlink = 
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink);
 
     // "ctrl-click to follow link:" for not MacOS

Reply via email to