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

[Tor Lillqvist]

 vcl/inc/salframe.hxx               |    3 ---
 vcl/win/source/window/salframe.cxx |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 073d1a35903b9e276d8eb3240b34c7a74ae47d8f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 18 15:49:05 2014 +0200

    Use the same names for these flag bits as the callers do
    
    No need for redundancy.
    
    Change-Id: Ia68d2e57af33cdca90246de54cdff656ea6c3942

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index cfc41b7..73c4e74 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -50,9 +50,6 @@ struct SystemEnvData;
 #define SAL_FRAME_TOTOP_GRABFOCUS           ((sal_uInt16)0x0004)
 #define SAL_FRAME_TOTOP_GRABFOCUS_ONLY       ((sal_uInt16)0x0008)
 
-#define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE  ((sal_uInt16)0x0001)
-#define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL    ((sal_uInt16)0x0002)
-
 // SalFrame styles
 #define SAL_FRAME_STYLE_DEFAULT             ((sal_uLong)0x00000001)
 #define SAL_FRAME_STYLE_MOVEABLE            ((sal_uLong)0x00000002)
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index f2a8fc6..5710645 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2282,7 +2282,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
     if ( hIMC )
     {
         DWORD nIndex;
-        if ( nFlags & SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE )
+        if ( nFlags & EXTTEXTINPUT_END_COMPLETE )
             nIndex = CPS_COMPLETE;
         else
             nIndex = CPS_CANCEL;