summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-06-06 17:43:20 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-09-23 15:09:16 +0100
commit41da83784e667453257ecd2cc409ff63bfe22f9f (patch)
treed61ac0ee30e8dea6fa86f90a5250f76d800fd525
parentAnti-alias toolbar button drop-downs. (diff)
downloadcore-41da83784e667453257ecd2cc409ff63bfe22f9f.tar.gz
core-41da83784e667453257ecd2cc409ff63bfe22f9f.zip
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 3f127e0afd08..99fefdeece20 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1137,6 +1137,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();
}