vcl/source/window/winproc.cxx | 4 +++-
vcl/win/source/window/salframe.cxx | 8 ++------
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 87561f10ba76de6d5453ed906ce24a052df72f18
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Dec 16 20:48:30 2014 +0200
Better (?) fix for deadlock in a situation with an IME and a URP client
This reverts commit 3e5371aba3eb29efb9574881212cba0975c168d7.
Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 661426a..662b115 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1745,8 +1745,10 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
}
// TrackingMode is ended in ImplHandleLoseFocus
+#ifdef _WIN32
// To avoid problems with the Unix IME
- // pFocusWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+ pFocusWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE );
+#endif
// XXX #102010# hack for accessibility: do not close the menu,
// even after focus lost
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 9bddbfc..f2a8fc6 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2294,12 +2294,8 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd,
sal_uInt16 nFlags )
void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
-
- SalData* pSalData = GetSalData();
- if ( pSalData->mnAppThreadId != GetCurrentThreadId() )
- ImplSalFrameEndExtTextInput( mhWnd, nFlags);
- else
- SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
+ // Must be called in the main thread!
+ SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
}
static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
