[Libreoffice-commits] core.git: Branch 'distro/vector/vtext-6.5' - vcl/source vcl/win

[Tor Lillqvist]

 vcl/source/window/winproc.cxx      |    4 +++-
 vcl/win/source/window/salframe.cxx |    8 ++------
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 5cd27c4b93c171b4afda73a6d62da06512d1908a
Author: Tor Lillqvist <tml at 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 2225ceb12cbf4b4886d270aef232a70e7ebf7b12.
    
    Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 56fc9b1..c360269 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1800,8 +1800,10 @@ IMPL_LINK_NOARG(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 5e27d51..1138ebd 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2389,12 +2389,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
-        ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
+    // Must be called in the main thread!
+    ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
 }
 
 // -----------------------------------------------------------------------