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

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 201143bf828dbe5e9545016ff0c968839d750692
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Nov 15 11:51:42 2018 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 16 13:35:15 2019 +0200

    lok sc: Fix the formula input bar and address bar notifications.
    
    Apparently we did not have the pInputWin living in the background; but
    now we have.  There is no reason to treat it in an 'else' branch, these
    checks should be separate either way.
    
    Change-Id: Ibb8d92fb1e2803942460d2063847917d082fcb2e
    Reviewed-on: https://gerrit.libreoffice.org/71863
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/76292
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 1d77ea8f3e64af4becff869474dd79c633dd0070)
    Reviewed-on: https://gerrit.libreoffice.org/77507
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 36af4bd5979c..3d7029d3aa30 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3691,11 +3691,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
 
                     if ( pInputWin )
                         pInputWin->SetTextString(aString);
-                    else if (comphelper::LibreOfficeKit::isActive())
-                    {
-                        if (pActiveViewSh)
-                            pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
-                    }
+
+                    if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
+                        pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
                 }
 
                 if ( pInputWin || comphelper::LibreOfficeKit::isActive())                        // Named range input
@@ -3733,10 +3731,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                         pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
                         pInputWin->SetSumAssignMode();
                     }
-                    else if (pActiveViewSh)
-                    {
+
+                    if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
                         pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr());
-                    }
                 }
 
                 if (bStopEditing)