diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 07:04:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 07:04:42 +0000 |
| commit | 0708201648e50a73f0315b2efa7cd58515d97ebc (patch) | |
| tree | 78cb770f1d11dd9cf6d69ab465692795101504db /vcl | |
| parent | a002b5076c2bb29a48e05ce36af86eefa1ae5c57 (diff) | |
INTEGRATION: CWS startcenterfix02 (1.13.92); FILE MERGED
2008/04/12 12:10:46 pl 1.13.92.1: #i88200# joining key and menu handling changes from aquavcl07
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/keycod.cxx | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 009887ca285d..042eac37aa41 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: keycod.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -49,30 +49,6 @@ // ======================================================================= -#ifdef MACOSX -static USHORT aImplKeyFuncTab[(KEYFUNC_FRONT+1)*3] = -{ - 0, 0, 0, // KEYFUNC_DONTKNOW - KEY_N | KEY_MOD3, 0, 0, // KEYFUNC_NEW - KEY_O | KEY_MOD3, KEY_OPEN, 0, // KEYFUNC_OPEN - KEY_S | KEY_MOD3, 0, 0, // KEYFUNC_SAVE - 0, 0, 0, // KEYFUNC_SAVEAS - KEY_P | KEY_MOD3, 0, 0, // KEYFUNC_PRINT - KEY_W | KEY_MOD3, KEY_F4 | KEY_MOD3, 0, // KEYFUNC_CLOSE - KEY_Q | KEY_MOD3, KEY_F4 | KEY_MOD2, 0, // KEYFUNC_QUIT - KEY_X | KEY_MOD3, KEY_DELETE | KEY_SHIFT, KEY_CUT, // KEYFUNC_CUT - KEY_C | KEY_MOD3, KEY_INSERT | KEY_MOD3, KEY_COPY, // KEYFUNC_COPY - KEY_V | KEY_MOD3, KEY_INSERT | KEY_SHIFT, KEY_PASTE, // KEYFUNC_PASTE - KEY_Z | KEY_MOD3, KEY_BACKSPACE | KEY_MOD2, KEY_UNDO, // KEYFUNC_UNDO - 0, 0, 0, // KEYFUNC_REDO - KEY_DELETE, 0, 0, // KEYFUNC_DELETE - KEY_REPEAT, 0, 0, // KEYFUNC_REPEAT - KEY_F | KEY_MOD3, KEY_FIND, 0, // KEYFUNC_FIND - KEY_F | KEY_SHIFT | KEY_MOD3, KEY_SHIFT | KEY_FIND, 0, // KEYFUNC_FINDBACKWARD - KEY_RETURN | KEY_MOD2, 0, 0, // KEYFUNC_PROPERTIES - 0, 0, 0 // KEYFUNC_FRONT -}; -#else static USHORT aImplKeyFuncTab[(KEYFUNC_FRONT+1)*3] = { 0, 0, 0, // KEYFUNC_DONTKNOW @@ -95,7 +71,7 @@ static USHORT aImplKeyFuncTab[(KEYFUNC_FRONT+1)*3] = KEY_RETURN | KEY_MOD2, 0, 0, // KEYFUNC_PROPERTIES 0, 0, 0 // KEYFUNC_FRONT }; -#endif + // ----------------------------------------------------------------------- void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3 ) |