summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-18 12:28:01 +0000
committerXisco Faulí <xiscofauli@libreoffice.org>2019-11-20 12:07:59 +0100
commit3244ea03fa7e84d218a4182afb8a78a50c6479a1 (patch)
tree95a23737faa6441d791d1695ddb4c1ff476de005 /sc
parenta99077bb8f3cdddc830e0c4140da1c091af63abb (diff)
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/83168 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/gridwin.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e2b1815141ec..3e13352820af 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1248,6 +1248,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 );