diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-05-30 08:33:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-05-30 08:33:00 +0000 |
| commit | ee9e7251af32fbe03f44da8231e101c38f2a50d7 (patch) | |
| tree | 2c0130ae0c0aa75d5403a37757ce929a6e9094df | |
| parent | 49cd805b233f31c6a2dc47c23a3732b094512155 (diff) | |
INTEGRATION: CWS notes4 (1.95.24); FILE MERGED
2008/04/29 15:44:25 mod 1.95.24.1: i87651
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 89a66d241e42..898ac3b01cb5 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: saldisp.cxx,v $ - * $Revision: 1.96 $ + * $Revision: 1.97 $ * * This file is part of OpenOffice.org. * @@ -1115,6 +1115,14 @@ void SalDisplay::ModifierMapping() XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const { String aStrMap; + + if( nKeyCode & KEY_MOD1 ) + { + if( aStrMap.Len() ) + aStrMap += '+'; + aStrMap += GetKeyNameFromKeySym( nCtrlKeySym_ ); + } + #ifdef MACOSX if( nKeyCode & KEY_MOD3 ) { @@ -1130,12 +1138,7 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const #endif aStrMap += GetKeyNameFromKeySym( nMod1KeySym_ ); } - if( nKeyCode & KEY_MOD1 ) - { - if( aStrMap.Len() ) - aStrMap += '+'; - aStrMap += GetKeyNameFromKeySym( nCtrlKeySym_ ); - } + if( nKeyCode & KEY_SHIFT ) { if( aStrMap.Len() ) |