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

[Michael Meeks (via logerrit)]

 vcl/source/window/winproc.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit ffe4a1d2aa9516a4c0e36b93c48b77e771637ac8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Jun 6 17:43:20 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 17 14:56:07 2019 +0200

    lok: remove ext text event re-entrancy hazard.
    
    Change-Id: I7566c158330bab77589d422c61c64210727ab835
    Reviewed-on: https://gerrit.libreoffice.org/73625
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/73756
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index e914d4e414b6..2db746df8162 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1133,6 +1133,12 @@ static bool ImplHandleExtTextInput( vcl::Window* pWindow,
         }
         if( !pChild->ImplGetWindowImpl()->mpFrameData->mnFocusId )
             break;
+
+        if (comphelper::LibreOfficeKit::isActive())
+        {
+            SAL_WARN("vcl", "Failed to get ext text input context");
+            break;
+        }
         Application::Yield();
     }