[Libreoffice-commits] core.git: cui/source officecfg/registry

[Yousuf Philips]

 cui/source/customize/acccfg.cxx                                |    6 +++
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   20 ++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit 61a91be4aaf6bdb40d6d1bde33b44eaf14014525
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Wed Mar 2 00:02:52 2016 +0400

    tdf#88027 Make insert date and time work in es, fi, ru, and pt
    
    Change-Id: I34f25d0e37c48335b458bc2aa92150500106ff29
    Reviewed-on: https://gerrit.libreoffice.org/22792
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a2b3b2d..35a1025 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -202,6 +202,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     KEY_MOD1 | KEY_BRACKETLEFT,
     KEY_MOD1 | KEY_BRACKETRIGHT,
     KEY_MOD1 | KEY_POINT,
+    KEY_MOD1 | KEY_COMMA,
 
     KEY_MOD1 | KEY_F1,
     KEY_MOD1 | KEY_F2,
@@ -280,6 +281,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     KEY_SHIFT | KEY_MOD1 | KEY_BRACKETLEFT,
     KEY_SHIFT | KEY_MOD1 | KEY_BRACKETRIGHT,
     KEY_SHIFT | KEY_MOD1 | KEY_POINT,
+    KEY_SHIFT | KEY_MOD1 | KEY_COMMA,
 
     KEY_SHIFT | KEY_MOD1 | KEY_F1,
     KEY_SHIFT | KEY_MOD1 | KEY_F2,
@@ -354,6 +356,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     KEY_MOD2 | KEY_BRACKETLEFT,
     KEY_MOD2 | KEY_BRACKETRIGHT,
     KEY_MOD2 | KEY_POINT,
+    KEY_MOD2 | KEY_COMMA,
 
     KEY_MOD2 | KEY_F1,
     KEY_MOD2 | KEY_F2,
@@ -427,6 +430,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     KEY_SHIFT | KEY_MOD2 | KEY_BRACKETLEFT,
     KEY_SHIFT | KEY_MOD2 | KEY_BRACKETRIGHT,
     KEY_SHIFT | KEY_MOD2 | KEY_POINT,
+    KEY_SHIFT | KEY_MOD2 | KEY_COMMA,
 
     KEY_SHIFT | KEY_MOD2 | KEY_F1,
     KEY_SHIFT | KEY_MOD2 | KEY_F2,
@@ -501,6 +505,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     KEY_MOD1 | KEY_MOD2 | KEY_BRACKETLEFT,
     KEY_MOD1 | KEY_MOD2 | KEY_BRACKETRIGHT,
     KEY_MOD1 | KEY_MOD2 | KEY_POINT,
+    KEY_MOD1 | KEY_MOD2 | KEY_COMMA,
 
     KEY_MOD1 | KEY_MOD2 | KEY_F1,
     KEY_MOD1 | KEY_MOD2 | KEY_F2,
@@ -574,6 +579,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
     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_COMMA,
 
     KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F1,
     KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F2,
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 7338768..dd64bdb 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1119,6 +1119,26 @@
             <value xml:lang="hu">.uno:InsertCurrentTime</value>
           </prop>
         </node>
+        <node oor:name="COMMA_MOD1" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="es">.uno:InsertCurrentDate</value>
+            <value xml:lang="fi">.uno:InsertCurrentDate</value>
+            <value xml:lang="ru">.uno:InsertCurrentDate</value>
+            <value xml:lang="pt">.uno:InsertCurrentDate</value>
+            <value xml:lang="pt-BR">.uno:InsertCurrentDate</value>
+          </prop>
+        </node>
+        <node oor:name="COMMA_SHIFT_MOD1" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="es">.uno:InsertCurrentTime</value>
+            <value xml:lang="fi">.uno:InsertCurrentTime</value>
+            <value xml:lang="ru">.uno:InsertCurrentTime</value>
+            <value xml:lang="pt">.uno:InsertCurrentTime</value>
+            <value xml:lang="pt-BR">.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>