diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:38:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:38:36 +0000 |
| commit | 7883169a6af1383018b4dd1d5a92c1dc154f7c25 (patch) | |
| tree | b95bc345130de50848bd89b871b4ebb011780518 /vcl/source/window/keycod.cxx | |
| parent | 7de2250d501eadb8e918aa6e805021ac7dcf44e0 (diff) | |
INTEGRATION: CWS warnings01 (1.6.70); FILE MERGED
2006/05/23 19:53:01 sb 1.6.70.2: RESYNC: (1.6-1.7); FILE MERGED
2006/03/20 18:20:07 pl 1.6.70.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'vcl/source/window/keycod.cxx')
| -rw-r--r-- | vcl/source/window/keycod.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 93361a100583..4ae32d61463d 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -4,9 +4,9 @@ * * $RCSfile: keycod.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-05-18 10:09:13 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:38:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,7 +129,7 @@ KeyCode::KeyCode( const ResId& rResId ) ImplGetKeyCode( eFunc, nCode, nDummy, nDummy ); } else - nCode = nKeyCode | nModifier; + nCode = sal::static_int_cast<USHORT>(nKeyCode | nModifier); } } |