[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit c057493a516313db0ee58a1d7ab09ecfacd2f2fc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 18 12:28:01 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 19 22:19:04 2019 +0100

    Related: tdf#125917 remove active editing when we want to replace contents
    
    this addresses comment #6 so that the chosen value is entered in the cell
    
    Change-Id: I3b45301e00b2f79038e88c926f15babd49dcc2bf
    Reviewed-on: https://gerrit.libreoffice.org/83167
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c3618dbe99da..930843825c44 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1233,6 +1233,11 @@ void ScGridWindow::FilterSelect( sal_uLong nSel )
 
 void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const OUString& rStr )
 {
+    ScModule* pScMod = SC_MOD();
+    ScInputHandler* pViewHdl = pScMod->GetInputHdl(pViewData->GetViewShell());
+    if (pViewHdl && pViewData->HasEditView(pViewData->GetActivePart()))
+        pViewHdl->CancelHandler();
+
     SCTAB nTab = pViewData->GetTabNo();
     ScViewFunc* pView = pViewData->GetView();
     pView->EnterData( nCol, nRow, nTab, rStr );