[ooo-build-commit] .: vcl/inc vcl/unx vcl/win

[Fridrich Strba]

 vcl/inc/vcl/keycodes.hxx        |    2 ++
 vcl/unx/gtk/window/gtkframe.cxx |    2 ++
 vcl/unx/source/app/saldisp.cxx  |   14 ++++++++++++++
 vcl/win/source/app/salinst.cxx  |    2 ++
 4 files changed, 20 insertions(+)

New commits:
commit 5f05da9b430458e2de7e42426b41e215bb9e1f58
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Sep 16 10:38:08 2010 +0200

    calc-jump-on-formula-ref-vcl.diff: Migrated
    
    n#464359, i#101018
    
    allow ctrl-[ and ctrl-] to jump to references used in a formula expression.

diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx
index bf03613..8316ec7 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/vcl/inc/vcl/keycodes.hxx
@@ -155,6 +155,8 @@
 #define KEY_DECIMAL     ((USHORT)::com::sun::star::awt::Key::DECIMAL)
 #define KEY_TILDE       ((USHORT)::com::sun::star::awt::Key::TILDE)
 #define KEY_QUOTELEFT   ((USHORT)::com::sun::star::awt::Key::QUOTELEFT)
+#define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT)
+#define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT)
 
 #define KEY_CODE		((USHORT)0x0FFF)
 
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 24e68e9..e3d6b6e 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -211,6 +211,8 @@ static USHORT GetKeyCode( guint keyval )
             case GDK_asciitilde:	nCode = KEY_TILDE;		break;
             case GDK_leftsinglequotemark:
             case GDK_quoteleft:	nCode = KEY_QUOTELEFT;		break;           
+            case GDK_bracketleft:  nCode = KEY_BRACKETLEFT;  break;
+            case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
             // some special cases, also see saldisp.cxx
             // - - - - - - - - - - - - -  Apollo - - - - - - - - - - - - - 0x1000
             case 0x1000FF02: // apXK_Copy
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 8e4263d..4cf8081 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -1259,6 +1259,12 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
         case KEY_QUOTELEFT:
             nKeySym = XK_grave;
             break;
+        case KEY_BRACKETLEFT:
+            nKeySym = XK_bracketleft;
+            break;
+        case KEY_BRACKETRIGHT:
+            nKeySym = XK_bracketright;
+            break;
 
         default:
             nKeySym = 0;
@@ -1589,6 +1595,14 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
             nKey = KEY_QUOTELEFT;
             *pcPrintable = '`';
             break;
+        case XK_bracketleft:
+            nKey = KEY_BRACKETLEFT;
+            *pcPrintable = '[';
+            break;
+         case XK_bracketright:
+             nKey = KEY_BRACKETRIGHT;
+             *pcPrintable = ']';
+             break;
 //      case XK_Linefeed:
 //          *pcPrintable = '\n';
 //          break;
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index bc2ab17..03011a7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -376,6 +376,8 @@ void SalData::initKeyCodeMap()
     initKey( '=', KEY_EQUAL );
     initKey( '~', KEY_TILDE );
     initKey( '`', KEY_QUOTELEFT );
+    initKey( '[', KEY_BRACKETLEFT );
+    initKey( ']', KEY_BRACKETRIGHT );
 }
 
 // =======================================================================