[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - editeng/source

[Tomaž Vajngerl (via logerrit)]

 editeng/source/editeng/editview.cxx |    5 -----
 editeng/source/editeng/impedit.cxx  |    9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 4ae9a263f24e06cb675dbe2408cbc160e6441a42
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Mar 23 08:42:56 2020 +0100
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Mon Mar 23 09:44:11 2020 +0100

    Revert "lok: avoid to grab the focus from the formula bar"
    
    Breaks tests:
    
    tiledrendering.cxx:1223:Assertion
    Test name: SdTiledRenderingTest::testCursorVisibility_SingleClick
    assertion failed
    - Expression: aView1.m_bCursorVisible
    
    tiledrendering.cxx:1257:Assertion
    Test name: SdTiledRenderingTest::testCursorVisibility_DoubleClick
    assertion failed
    - Expression: aView1.m_bCursorVisible
    
    This reverts commit 3a7486b16ee89031ef9ae36a07474a8fa13b7de3.
    
    Change-Id: I725bd3026dcb34f673f8482e38e1fdf8c7a24377

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 66c8ed6f5b4a..24d0947d7de5 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -486,11 +486,6 @@ void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bActivat
             if (pParent && pParent->GetLOKWindowId() != 0)
                 return;
 
-            // We need to avoid to grab the focus from the formula bar
-            vcl::Window* pWindow = Application::GetFocusWindow();
-            if (!pWindow || pWindow != pImpEditView->pOutWin)
-                return;
-
             static const OString aPayload = OString::boolean(true);
             pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload.getStr());
             pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload);
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index e5bf2f3d3cf3..c9ad00241a55 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1196,13 +1196,8 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
                     }
                 }
 
-                // We need to avoid to grab the focus from the formula bar
-                vcl::Window* pWindow = Application::GetFocusWindow();
-                if (pWindow && pWindow == pOutWin)
-                {
-                    SfxLokHelper::notifyVisCursorInvalidation(mpViewShell, sRect, bIsWrong, sHyperlink);
-                    mpViewShell->NotifyOtherViews(LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", sRect);
-                }
+                SfxLokHelper::notifyVisCursorInvalidation(mpViewShell, sRect, bIsWrong, sHyperlink);
+                mpViewShell->NotifyOtherViews(LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", sRect);
             }
         }