summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-06-06 17:43:20 +0100
committerAndras Timar <andras.timar@collabora.com>2019-06-17 14:56:07 +0200
commitffe4a1d2aa9516a4c0e36b93c48b77e771637ac8 (patch)
tree78788c84fdeb0d2f7dea97ca066caf343448a70d
parent59ffa0b68eec6b11f0453d69a1086457b31a5cbc (diff)
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@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/73756 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--vcl/source/window/winproc.cxx6
1 files changed, 6 insertions, 0 deletions
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();
}