diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 01:35:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 01:38:43 +0200 |
| commit | b54480ea7882df03b5d69b43ff080db72da14835 (patch) | |
| tree | 970beea9f2dfb33b404687f18ccf0edc2276b94b /vcl/win | |
| parent | 69a9cffb9e6285a8735e4b35cdea9db4b118063c (diff) | |
No need for two sets of names for the same exttextinput flag bits
Change-Id: Ic5756d75bc86795a7add95694aef6fc9d1f6b9fa
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 5dd5d75b8b73..5951b15f3690 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5206,17 +5206,17 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, sal_uInt16 nSalAttr; if ( nWinAttr == ATTR_TARGET_CONVERTED ) { - nSalAttr = SAL_EXTTEXTINPUT_ATTR_BOLDUNDERLINE; - aEvt.mnCursorFlags |= SAL_EXTTEXTINPUT_CURSOR_INVISIBLE; + nSalAttr = EXTTEXTINPUT_ATTR_BOLDUNDERLINE; + aEvt.mnCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE; } else if ( nWinAttr == ATTR_CONVERTED ) - nSalAttr = SAL_EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE; + nSalAttr = EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE; else if ( nWinAttr == ATTR_TARGET_NOTCONVERTED ) - nSalAttr = SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT; + nSalAttr = EXTTEXTINPUT_ATTR_HIGHLIGHT; else if ( nWinAttr == ATTR_INPUT_ERROR ) - nSalAttr = SAL_EXTTEXTINPUT_ATTR_REDTEXT | SAL_EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE; + nSalAttr = EXTTEXTINPUT_ATTR_REDTEXT | EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE; else /* ( nWinAttr == ATTR_INPUT ) */ - nSalAttr = SAL_EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE; + nSalAttr = EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE; pSalAttrAry[i] = nSalAttr; } @@ -5248,9 +5248,9 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, aEvt.mnCursorPos = LOWORD( ImmGetCompositionStringW( hIMC, GCS_CURSORPOS, 0, 0 ) ); if ( pFrame->mbCandidateMode ) - aEvt.mnCursorFlags |= SAL_EXTTEXTINPUT_CURSOR_INVISIBLE; + aEvt.mnCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE; if ( lParam & CS_NOMOVECARET ) - aEvt.mnCursorFlags |= SAL_EXTTEXTINPUT_CURSOR_OVERWRITE; + aEvt.mnCursorFlags |= EXTTEXTINPUT_CURSOR_OVERWRITE; pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEvt ); } |