diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-11-16 21:50:02 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-11-21 20:26:30 +0000 |
| commit | 4c62de279a6783236a5e0811d0733e107c127fe3 (patch) | |
| tree | 33feedadca40a01cd4dde93d29d3dfa9ffd38e8f /vcl | |
| parent | bd614b91352b5a0a291f33a428c95d7bcbf34679 (diff) | |
Fix various "unmapped accelerator key" on MacOs
Add mapping for:
KEY_SEMICOLON
KEY_BACKSPACE
KEY_PAGEUP
KEY_PAGEDOWN
KEY_UP
KEY_DOWN
KEY_RETURN
KEY_BRACKETLEFT
KEY_BRACKETRIGHT
Retrieved from AquaSalFrame::GetKeyName
I would have preferred to use this function and remove custom mapping to avoid dup but mapping is a bit different
eg: in AquaSalFrame::GetKeyName KEY_A to KEY_Z uses sal_Unicode( 'A' + (i - KEY_A) )
In SetAccelerator, we use sal_Unicode( 'a' + (i - KEY_A) )
and when using GetKeyName, LO segfaults.
Change-Id: I3808cdcd1c0566e768a98a211bc1f41ff012a32f
Reviewed-on: https://gerrit.libreoffice.org/30909
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salmenu.cxx | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 4477af4d10e3..c567f9ecbed2 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -714,6 +714,33 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, case KEY_EQUAL: nCommandKey='='; break; + case KEY_SEMICOLON: + nCommandKey=';'; + break; + case KEY_BACKSPACE: + nCommandKey=sal_Unicode( 0x232b ); + break; + case KEY_PAGEUP: + nCommandKey=sal_Unicode( 0x21de ); + break; + case KEY_PAGEDOWN: + nCommandKey=sal_Unicode( 0x21df ); + break; + case KEY_UP: + nCommandKey=sal_Unicode( 0x21e1 ); + break; + case KEY_DOWN: + nCommandKey=sal_Unicode( 0x21e3 ); + break; + case KEY_RETURN: + nCommandKey=sal_Unicode( 0x21a9 ); + break; + case KEY_BRACKETLEFT: + nCommandKey='['; + break; + case KEY_BRACKETRIGHT: + nCommandKey=']'; + break; } } } |