[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source

[Pranam Lashkari (via logerrit)]

 desktop/source/lib/init.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2dd50a40fa295ed75ad16e379e3781cf5e31f21b
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Wed Jan 20 14:30:14 2021 +0530
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Fri Apr 2 19:45:41 2021 +0200

    Do not skip cursor invalidation if hyperlink in payload
    
    Change-Id: Iba08f9a52a282bdab890eeb4194222d0b576d64b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109664
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit f7b31b02f2fe28f75d2a70c0261897aba4a7b72d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109676
    Tested-by: Jenkins
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>
    (cherry picked from commit 1a13ba5927e5f2fdd8f1461bae568b48dd4abe0b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113491
    Tested-by: Pranam Lashkari <lpranam at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5f1c413090c3..a302b5d46f76 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1429,7 +1429,9 @@ void CallbackFlushHandler::queue(const int type, const char* data)
 
     // Suppress invalid payloads.
     if (type == LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
-        payload.find(", 0, 0, ") != std::string::npos)
+        payload.find(", 0, 0, ") != std::string::npos &&
+        payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+        payload.find("\"hyperlink\": {}") == std::string::npos)
     {
         // The cursor position is often the relative coordinates of the widget
         // issuing it, instead of the absolute one that we expect.