[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cui/source officecfg/registry sc/sdi vcl/unx

[Andras Timar]

 cui/source/customize/acccfg.cxx                                |    5 +++++
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   10 ++++++++++
 sc/sdi/scalc.sdi                                               |    4 ++--
 vcl/unx/generic/app/saldisp.cxx                                |    3 ++-
 vcl/unx/gtk/window/gtkframe.cxx                                |    2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 1739e62cfcf08091009ba6320e19d08a9db70f84
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Dec 13 14:32:24 2011 +0100

    fdo#30714 move SID_INSERT_CURRENT_DATE/TIME to GID_INSERT
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index b030a95..99976ec 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -7948,7 +7948,7 @@ SfxVoidItem InsertCurrentDate SID_INSERT_CURRENT_DATE
     MenuConfig = TRUE,
     StatusBarConfig = FALSE,
     ToolBoxConfig = FALSE,
-    GroupId = GID_OPTIONS;
+    GroupId = GID_INSERT;
 ]
 
 //--------------------------------------------------------------------------
@@ -7973,7 +7973,7 @@ SfxVoidItem InsertCurrentTime SID_INSERT_CURRENT_TIME
     MenuConfig = TRUE,
     StatusBarConfig = FALSE,
     ToolBoxConfig = FALSE,
-    GroupId = GID_OPTIONS;
+    GroupId = GID_INSERT;
 ]
 
 //--------------------------------------------------------------------------
commit d0b0dabaa949cf279420c3770265acc4f8532bfa
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Dec 13 00:46:27 2011 +0100

    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-'.'
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 94bd8e3..d26c5a2 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;