diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-01-29 12:09:27 +0100 |
|---|---|---|
| committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-03-06 10:43:20 +0100 |
| commit | 538dc87c56cd5c796c67d2be60be007e519505c9 (patch) | |
| tree | 689ad72d03c04faac4a337618e385a8afd85e3a5 | |
| parent | 6fdd5e3ec95712d03b30fc32acffa358b7fef46e (diff) | |
lok: avoid to send visible cursor msg for formula bar edit view
Cursor visible msg should be sent only if the window linked to the
edit view is the document window.
Change-Id: Ib4001dbddd191b06fa02d5b8ddab14460270b327
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87680
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Tested-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90070
Tested-by: Jenkins
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index b793a68b071f..315f9ef6716f 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -478,6 +478,10 @@ void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bActivat if (pImpEditView->mpViewShell && !bActivate) { + VclPtr<vcl::Window> pParent = pImpEditView->pOutWin->GetParentWithLOKNotifier(); + if (pParent && pParent->GetLOKWindowId() != 0) + return; + OString aPayload = OString::boolean(true); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload.getStr()); pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); @@ -491,6 +495,10 @@ void EditView::HideCursor(bool bDeactivate) if (pImpEditView->mpViewShell && !bDeactivate) { + VclPtr<vcl::Window> pParent = pImpEditView->pOutWin->GetParentWithLOKNotifier(); + if (pParent && pParent->GetLOKWindowId() != 0) + return; + OString aPayload = OString::boolean(false); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload.getStr()); pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); |