applied_patches/0170-calc-jump-on-formula-ref-vcl.diff

   1 diff --git vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/keycodes.hxx
   2 index 8e7c6a4..8102826 100644
   3 --- vcl/inc/vcl/keycodes.hxx
   4 +++ vcl/inc/vcl/keycodes.hxx
   5 @@ -158,6 +158,8 @@
   6  #define KEY_DECIMAL     ((USHORT)::com::sun::star::awt::Key::DECIMAL)
   7  #define KEY_TILDE       ((USHORT)::com::sun::star::awt::Key::TILDE)
   8  #define KEY_QUOTELEFT   ((USHORT)::com::sun::star::awt::Key::QUOTELEFT)
   9 +#define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT)
  10 +#define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT)
  11
  12  #define KEY_CAPSLOCK    ((USHORT)::com::sun::star::awt::Key::CAPSLOCK)
  13  #define KEY_NUMLOCK     ((USHORT)::com::sun::star::awt::Key::NUMLOCK)
  14 diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
  15 index 16193c3..6f07f1c 100644
  16 --- vcl/unx/gtk/window/gtkframe.cxx
  17 +++ vcl/unx/gtk/window/gtkframe.cxx
  18 @@ -212,6 +212,8 @@ static USHORT GetKeyCode( guint keyval )
  19              case GDK_asciitilde:       nCode = KEY_TILDE;              break;
  20              case GDK_leftsinglequotemark:
  21              case GDK_quoteleft:        nCode = KEY_QUOTELEFT;          break;
  22 +            case GDK_bracketleft:  nCode = KEY_BRACKETLEFT;  break;
  23 +            case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
  24              // some special cases, also see saldisp.cxx
  25              // - - - - - - - - - - - - -  Apollo - - - - - - - - - - - - - 0x1000
  26              case 0x1000FF02: // apXK_Copy
  27 diff --git vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
  28 index f505eb5..00ab850 100644
  29 --- vcl/unx/source/app/saldisp.cxx
  30 +++ vcl/unx/source/app/saldisp.cxx
  31 @@ -1314,6 +1314,12 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
  32          case KEY_QUOTELEFT:
  33              nKeySym = XK_grave;
  34              break;
  35 +        case KEY_BRACKETLEFT:
  36 +            nKeySym = XK_bracketleft;
  37 +            break;
  38 +        case KEY_BRACKETRIGHT:
  39 +            nKeySym = XK_bracketright;
  40 +            break;
  41
  42          default:
  43              nKeySym = 0;
  44 @@ -1644,6 +1650,14 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
  45              nKey = KEY_QUOTELEFT;
  46              *pcPrintable = '`';
  47              break;
  48 +        case XK_bracketleft:
  49 +            nKey = KEY_BRACKETLEFT;
  50 +            *pcPrintable = '[';
  51 +            break;
  52 +         case XK_bracketright:
  53 +             nKey = KEY_BRACKETRIGHT;
  54 +             *pcPrintable = ']';
  55 +             break;
  56  //      case XK_Linefeed:
  57  //          *pcPrintable = '\n';
  58  //          break;
  59 diff --git vcl/win/source/app/salinst.cxx vcl/win/source/app/salinst.cxx
  60 index 621d8f1..b8ad8b5 100644
  61 --- vcl/win/source/app/salinst.cxx
  62 +++ vcl/win/source/app/salinst.cxx
  63 @@ -376,6 +376,8 @@ void SalData::initKeyCodeMap()
  64         initKey( '=', KEY_EQUAL );
  65         initKey( '~', KEY_TILDE );
  66         initKey( '`', KEY_QUOTELEFT );
  67 +    initKey( '[', KEY_BRACKETLEFT );
  68 +    initKey( ']', KEY_BRACKETRIGHT );
  69  }
  70
  71  // =======================================================================