core.git: sc/source

[Rashesh (via logerrit)]

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

New commits:
commit 263e0c5665a45bc181ac00803127ce2e12dfadc0
Author:     Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Fri Sep 13 15:48:16 2024 +0530
Commit:     vivek javiya <vivek.jav...@collabora.com>
CommitDate: Fri Oct 4 12:26:43 2024 +0200

    cool#10040: fix: send LOK_CALLBACK_CELLFORMULA with LOK formulabar update
    
    - we were not getting the cell content when we are editing cell using
    formulabar in online. This message is important to autocomplete formulas
    in online.
    
    Change-Id: I62da49cb8800583931ffefcc39ab181ab9562eb6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173333
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    (cherry picked from commit 67699071ba8bf51055028ea185b0afc2a1540f9e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174006
    Reviewed-by: vivek javiya <vivek.jav...@collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e2401b7f915d..d6b7544d33cb 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2806,15 +2806,6 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, 
bool bSetModified )
             // If we will end up updating LoKit at the end, we can skip it here
             pInputWin->SetTextString(aText, !bUpdateKit);
         }
-
-        if (comphelper::LibreOfficeKit::isActive())
-        {
-            if (pActiveViewSh)
-            {
-                // TODO: deprecated?
-                
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aText.toUtf8());
-            }
-        }
     }
 
     // If the cursor is before the end of a paragraph, parts are being pushed 
to
@@ -2857,8 +2848,10 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, 
bool bSetModified )
         if (pActiveView)
             aSel = pActiveView->GetSelection();
 
+        OUString aText = ScEditUtil::GetMultilineString(*mpEditEngine);
+        pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aText.toUtf8());
         pActiveViewSh->LOKSendFormulabarUpdate(pActiveView,
-                                               
ScEditUtil::GetMultilineString(*mpEditEngine),
+                                               aText,
                                                aSel);
     }
 
@@ -4365,7 +4358,6 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* 
pState,
                             aSel.nEndPara = 0;
 
                         pActiveViewSh->LOKSendFormulabarUpdate(pActiveView, 
aString, aSel);
-                        // TODO: deprecated?
                         
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aString.toUtf8());
                     }
                 }