Attachment 54381 Details for Bug 30714 – Patch to test.

Patch to test.

0001-fdo-30714-Use-different-default-key-bindings-for-Hun.patch (text/plain), 4.92 KB, created by Miklos Vajna on 2011-12-12 15:51:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miklos Vajna

Created: 2011-12-12 15:51:54 UTC

Size: 4.92 KB

patch

obsolete

>From f46959d0e9fefd1d96c83aaae7644441bbb1de58 Mon Sep 17 00:00:00 2001
>From: Miklos Vajna <vmiklos@frugalware.org>
>Date: Tue, 13 Dec 2011 00:46:27 +0100
>Subject: [PATCH] fdo#30714 Use different default key bindings for Hungarian
> locale
>
>Mimic Hungarian Excel's key bindings:
>
>* inserting current date is Ctrl-'.'
>* inserting current time is Ctrl-Shift-'.'
>---
> cui/source/customize/acccfg.cxx                    |    5 +++++
> .../data/org/openoffice/Office/Accelerators.xcu    |   10 ++++++++++
> vcl/unx/generic/app/saldisp.cxx                    |    3 ++-
> vcl/unx/gtk/window/gtkframe.cxx                    |    2 +-
> 4 files changed, 18 insertions(+), 2 deletions(-)
>
>diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
>index e976a9d..159272f 100644
>--- a/cui/source/customize/acccfg.cxx
>+++ b/cui/source/customize/acccfg.cxx
>@@ -226,6 +226,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
>     KEY_SEMICOLON    | KEY_MOD1 ,
>     KEY_BRACKETLEFT  | KEY_MOD1 ,
>     KEY_BRACKETRIGHT | KEY_MOD1,
>+    KEY_POINT    | KEY_MOD1 ,
> 
>     KEY_F1        | KEY_MOD1 ,
>     KEY_F2        | KEY_MOD1 ,
>@@ -302,6 +303,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
>     KEY_SEMICOLON    | KEY_SHIFT | KEY_MOD1 ,
>     KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD1 ,
>     KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
>+    KEY_POINT    | KEY_SHIFT | KEY_MOD1,
> 
>     KEY_F1        | KEY_SHIFT | KEY_MOD1,
>     KEY_F2        | KEY_SHIFT | KEY_MOD1,
>@@ -373,6 +375,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
>     KEY_SEMICOLON    | KEY_MOD2 ,
>     KEY_BRACKETLEFT  | KEY_MOD2 ,
>     KEY_BRACKETRIGHT | KEY_MOD2,
>+    KEY_POINT    | KEY_MOD2 ,
> 
>     KEY_F1        | KEY_MOD2 ,
>     KEY_F2        | KEY_MOD2 ,
>@@ -444,6 +447,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
>     KEY_SEMICOLON    | KEY_SHIFT | KEY_MOD2 ,
>     KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD2 ,
>     KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
>+    KEY_POINT    | KEY_SHIFT | KEY_MOD2,
> 
>     KEY_F1        | KEY_SHIFT | KEY_MOD2,
>     KEY_F2        | KEY_SHIFT | KEY_MOD2,
>@@ -583,6 +587,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
>     KEY_SEMICOLON    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
>     KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
>     KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
>+    KEY_POINT    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
> 
>     KEY_F1        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
>     KEY_F2        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
>diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
>index 2f0bfef..30702f9 100644
>--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
>+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
>@@ -815,6 +815,16 @@
>       <value xml:lang="en-US">.uno:InsertCurrentTime</value>
>      </prop>
>     </node>
>+    <node oor:name="POINT_MOD1" oor:op="replace">
>+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
>+      <value xml:lang="hu">.uno:InsertCurrentDate</value>
>+     </prop>
>+    </node>
>+    <node oor:name="POINT_SHIFT_MOD1" oor:op="replace">
>+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
>+      <value xml:lang="hu">.uno:InsertCurrentTime</value>
>+     </prop>
>+    </node>
>     <node oor:name="BRACKETLEFT_MOD1" oor:op="replace">
>      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
>       <value xml:lang="en-US">.uno:MarkPrecedents</value>
>diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
>index 07eef83..3c53b7b 100644
>--- a/vcl/unx/generic/app/saldisp.cxx
>+++ b/vcl/unx/generic/app/saldisp.cxx
>@@ -1125,7 +1125,7 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
>             nKeySym = XK_slash;
>             break;
>         case KEY_POINT:
>-            nKeySym = XK_period;
>+            aCustomKeyName = '.';
>             break;
>         case KEY_COMMA:
>             nKeySym = XK_comma;
>@@ -1467,6 +1467,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
>             break;
>         case XK_period:
>             nKey = KEY_POINT;
>+            *pcPrintable = '.';
>             break;
>         case XK_comma:
>             nKey = KEY_COMMA;
>diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
>index ec318c9..2e1c106 100644
>--- a/vcl/unx/gtk/window/gtkframe.cxx
>+++ b/vcl/unx/gtk/window/gtkframe.cxx
>@@ -215,7 +215,7 @@ static sal_uInt16 GetKeyCode( guint keyval )
>             case GDK_KP_Multiply:   nCode = KEY_MULTIPLY;   break;
>             case GDK_slash:
>             case GDK_KP_Divide:     nCode = KEY_DIVIDE;     break;
>-            case GDK_period:
>+            case GDK_period:        nCode = KEY_POINT;      break;
>             case GDK_decimalpoint:  nCode = KEY_POINT;      break;
>             case GDK_comma:         nCode = KEY_COMMA;      break;
>             case GDK_less:          nCode = KEY_LESS;       break;
>-- 
>1.7.6
>

Actions: View

Attachments on bug 30714: 54381