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

[Marco Cecchetti (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1e2c7aac60550c94f8e147eda039b2adc59bee03
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Sun Jun 7 21:39:59 2020 +0200
Commit:     Marco Cecchetti <marco.cecchetti at collabora.com>
CommitDate: Mon Apr 19 10:14:07 2021 +0200

    lok: formula bar: disable tunneled tooltips
    
    Tooltips overlaps the entered text.
    
    Change-Id: If003217fe1270a4a3ebc0ba9eee71cb8f6765760
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95792
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit c4e26fb75f904fc56bd7bcaf200b3227b9065afa)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113999
    Tested-by: Jenkins
    Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114256
    Tested-by: Marco Cecchetti <marco.cecchetti at collabora.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c7426232cfa4..1223999698c6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1345,10 +1345,9 @@ namespace {
 void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec )
 {
     const SfxViewShell* pViewShell = SfxViewShell::Current();
-    if (comphelper::LibreOfficeKit::isActive() &&
-            pViewShell && pViewShell->isLOKMobilePhone())
+    if (comphelper::LibreOfficeKit::isActive())
     {
-        if (rFuncStrVec.size())
+        if (rFuncStrVec.size() && pViewShell && pViewShell->isLOKMobilePhone())
         {
             auto aPos = pFormulaData->begin();
             sal_uInt32 nCurIndex = std::distance(aPos, miAutoPosFormula);
@@ -1402,6 +1401,7 @@ void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec
             OString s = aPayload.makeStringAndClear();
             pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CALC_FUNCTION_LIST, s.getStr());
         }
+        // not tunnel tooltips in the lok case
         return;
     }