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

[Kohei Yoshida]

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

New commits:
commit abb7100875ce74b1b80362357ff1812315d0ac31
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 18:04:55 2010 -0400

    Ported calc-insert-current-time-vcl.diff from ooo-build.
    
    This is part of the feature that allows the users to insert current
    date and time in Calc via single key stroke.

diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx
index 7275947..6b4289a 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/vcl/inc/vcl/keycodes.hxx
@@ -157,6 +157,7 @@
 #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_SEMICOLON   ((USHORT)::com::sun::star::awt::Key::SEMICOLON)
 
 #define KEY_CAPSLOCK    ((USHORT)::com::sun::star::awt::Key::CAPSLOCK)
 #define KEY_NUMLOCK     ((USHORT)::com::sun::star::awt::Key::NUMLOCK)
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4c24327..27b63bd 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -213,6 +213,7 @@ static USHORT GetKeyCode( guint keyval )
             case GDK_quoteleft:	nCode = KEY_QUOTELEFT;		break;           
             case GDK_bracketleft:  nCode = KEY_BRACKETLEFT;  break;
             case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
+            case GDK_semicolon:    nCode = KEY_SEMICOLON;   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 a176367..71bbdbb 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -1336,6 +1336,9 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
         case KEY_BRACKETRIGHT:
             nKeySym = XK_bracketright;
             break;
+        case KEY_SEMICOLON:
+            nKeySym = XK_semicolon;
+            break;
 
         default:
             nKeySym = 0;
@@ -1674,6 +1677,10 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
              nKey = KEY_BRACKETRIGHT;
              *pcPrintable = ']';
              break;
+        case XK_semicolon:
+            nKey = KEY_SEMICOLON;
+            *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 03011a7..3afbbff 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -378,6 +378,7 @@ void SalData::initKeyCodeMap()
     initKey( '`', KEY_QUOTELEFT );
     initKey( '[', KEY_BRACKETLEFT );
     initKey( ']', KEY_BRACKETRIGHT );
+    initKey( ';', KEY_SEMICOLON );
 }
 
 // =======================================================================