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

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 4a226f94f506dc87fcb34486b6a00cfa2f4f0e35
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Nov 15 11:51:42 2018 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon May 6 15:36:36 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>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2077b42d2433..3c65a12295fc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3692,11 +3692,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
@@ -3734,10 +3732,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)