sc/source/ui/app/inputhdl.cxx | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 2ea5e9d6db6aaea4e30e4511b1668a17ec970a0b
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Wed Feb 26 14:48:55 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 29 09:54:42 2020 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
