diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-02-26 14:48:55 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-04-29 09:54:42 +0200 |
| commit | 2ea5e9d6db6aaea4e30e4511b1668a17ec970a0b (patch) | |
| tree | 23f4a30712c0abfefe8beda379fe82cf9e53c5f7 /sc | |
| parent | 1bb432503f0fb3af12f1405f343c5305206907c4 (diff) | |
lok: formula input bar: get a function inserted in a not focused top view
Change-Id: Ia52ebbcad8d3febab85f19279859e901f8193c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89548
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index f18995f4fc35..8f422831c6a6 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1636,17 +1636,29 @@ void ScInputHandler::PasteFunctionData() HideTip(); EditView* pActiveView = pTopView ? pTopView : pTableView; + if (comphelper::LibreOfficeKit::isActive() && pTopView && pInputWin) + pInputWin->TextGrabFocus(); if (pActiveView) pActiveView->ShowCursor(); } void ScInputHandler::LOKPasteFunctionData( sal_uInt32 nIndex ) { - if (pActiveViewSh && (pTopView || pTableView)) + // in case we have no top view try to create it + if (!pTopView && pInputWin) + { + ScInputMode eCurMode = eMode; + SetMode(SC_INPUT_TOP); + if (!pTopView) + SetMode(eCurMode); + } + + EditView* pEditView = pTopView ? pTopView : pTableView; + + if (pActiveViewSh && pEditView) { bool bEdit = false; OUString aFormula; - EditView* pEditView = pTopView ? pTopView : pTableView; const EditEngine* pEditEngine = pEditView->GetEditEngine(); if (pEditEngine) { |