[Libreoffice-commits] core.git: vcl/source vcl/win

Caolán McNamara caolanm at redhat.com
Wed May 27 04:17:54 PDT 2015


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

New commits:
commit a99a04d3f85f531f9243569939599d7b0a16d9e7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 27 12:16:30 2015 +0100

    EndExtTextInput::Complete->EndExtTextInputFlags::Complete
    
    Change-Id: I5039d68aad2849664a42b1a8c04f3703c98d4d8b

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index d447ea5..a56f94d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1856,7 +1856,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
                 // TrackingMode is ended in ImplHandleLoseFocus
 #ifdef _WIN32
                 // To avoid problems with the Unix IME
-                pFocusWin->EndExtTextInput( EndExtTextInput::Complete );
+                pFocusWin->EndExtTextInput( EndExtTextInputFlags::Complete );
 #endif
 
                 // XXX #102010# hack for accessibility: do not close the menu,
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 42f12b2..287f0be 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2285,7 +2285,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, EndExtTextInputFlags nFlags
     if ( hIMC )
     {
         DWORD nIndex;
-        if ( nFlags & EndExtTextInput::Complete )
+        if ( nFlags & EndExtTextInputFlags::Complete )
             nIndex = CPS_COMPLETE;
         else
             nIndex = CPS_CANCEL;


More information about the Libreoffice-commits mailing list