diff options
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 34 | ||||
| -rw-r--r-- | vcl/osx/salmenu.cxx | 12 |
2 files changed, 23 insertions, 23 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 28284b4a73fc..9283a1fe7149 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -962,20 +962,20 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ i ] = aKey.makeStringAndClear(); } - aKeyMap[ KEY_DOWN ] = OUString( sal_Unicode( 0x21e3 ) ); - aKeyMap[ KEY_UP ] = OUString( sal_Unicode( 0x21e1 ) ); - aKeyMap[ KEY_LEFT ] = OUString( sal_Unicode( 0x21e0 ) ); - aKeyMap[ KEY_RIGHT ] = OUString( sal_Unicode( 0x21e2 ) ); - aKeyMap[ KEY_HOME ] = OUString( sal_Unicode( 0x2196 ) ); - aKeyMap[ KEY_END ] = OUString( sal_Unicode( 0x2198 ) ); - aKeyMap[ KEY_PAGEUP ] = OUString( sal_Unicode( 0x21de ) ); - aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) ); - aKeyMap[ KEY_RETURN ] = OUString( sal_Unicode( 0x21a9 ) ); + aKeyMap[ KEY_DOWN ] = OUString( u'\x21e3' ); + aKeyMap[ KEY_UP ] = OUString( u'\x21e1' ); + aKeyMap[ KEY_LEFT ] = OUString( u'\x21e0' ); + aKeyMap[ KEY_RIGHT ] = OUString( u'\x21e2' ); + aKeyMap[ KEY_HOME ] = OUString( u'\x2196' ); + aKeyMap[ KEY_END ] = OUString( u'\x2198' ); + aKeyMap[ KEY_PAGEUP ] = OUString( u'\x21de' ); + aKeyMap[ KEY_PAGEDOWN ] = OUString( u'\x21df' ); + aKeyMap[ KEY_RETURN ] = OUString( u'\x21a9' ); aKeyMap[ KEY_ESCAPE ] = "esc"; - aKeyMap[ KEY_TAB ] = OUString( sal_Unicode( 0x21e5 ) ); - aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) ); - aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) ); - aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) ); + aKeyMap[ KEY_TAB ] = OUString( u'\x21e5' ); + aKeyMap[ KEY_BACKSPACE ]= OUString( u'\x232b' ); + aKeyMap[ KEY_SPACE ] = OUString( u'\x2423' ); + aKeyMap[ KEY_DELETE ] = OUString( u'\x2326' ); aKeyMap[ KEY_ADD ] = "+"; aKeyMap[ KEY_SUBTRACT ] = "-"; aKeyMap[ KEY_DIVIDE ] = "/"; @@ -985,7 +985,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_LESS ] = "<"; aKeyMap[ KEY_GREATER ] = ">"; aKeyMap[ KEY_EQUAL ] = "="; - aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) ); + aKeyMap[ KEY_OPEN ] = OUString( u'\x23cf' ); aKeyMap[ KEY_TILDE ] = "~"; aKeyMap[ KEY_BRACKETLEFT ] = "["; aKeyMap[ KEY_BRACKETRIGHT ] = "]"; @@ -1022,13 +1022,13 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) if( it != aKeyMap.end() ) { if( (nKeyCode & KEY_SHIFT) != 0 ) - aResult.append( sal_Unicode( 0x21e7 ) ); + aResult.append( u'\x21e7' ); if( (nKeyCode & KEY_MOD1) != 0 ) - aResult.append( sal_Unicode( 0x2318 ) ); + aResult.append( u'\x2318' ); // we do not really handle Alt (see below) // we map it to MOD3, which is actually Command if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 ) - aResult.append( sal_Unicode( 0x2325 ) ); + aResult.append( u'\x2325' ); aResult.append( it->second ); } diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 1915cc3e8e32..d943c82064bc 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -718,22 +718,22 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, nCommandKey=';'; break; case KEY_BACKSPACE: - nCommandKey=sal_Unicode( 0x232b ); + nCommandKey=u'\x232b'; break; case KEY_PAGEUP: - nCommandKey=sal_Unicode( 0x21de ); + nCommandKey=u'\x21de'; break; case KEY_PAGEDOWN: - nCommandKey=sal_Unicode( 0x21df ); + nCommandKey=u'\x21df'; break; case KEY_UP: - nCommandKey=sal_Unicode( 0x21e1 ); + nCommandKey=u'\x21e1'; break; case KEY_DOWN: - nCommandKey=sal_Unicode( 0x21e3 ); + nCommandKey=u'\x21e3'; break; case KEY_RETURN: - nCommandKey=sal_Unicode( 0x21a9 ); + nCommandKey=u'\x21a9'; break; case KEY_BRACKETLEFT: nCommandKey='['; |