diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-12-18 15:49:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-12-18 15:52:15 +0200 |
| commit | 073d1a35903b9e276d8eb3240b34c7a74ae47d8f (patch) | |
| tree | ed14892eb0ef43e2c2c32cbe95d064a7f696c9c4 | |
| parent | 09906a00584fe7106d573dd07d8f627479637214 (diff) | |
Use the same names for these flag bits as the callers do
No need for redundancy.
Change-Id: Ia68d2e57af33cdca90246de54cdff656ea6c3942
| -rw-r--r-- | vcl/inc/salframe.hxx | 3 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index cfc41b74ee27..73c4e745737a 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 f2a8fc64f2d3..571064574f4c 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; |