[Libreoffice-commits] core.git: vcl/unx

[Rishabh Kumar]

 vcl/unx/generic/app/keysymnames.cxx |    2 ++
 vcl/unx/generic/app/saldisp.cxx     |   12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 144ab285566afa18790356b5497573290ee710bf
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Sun Mar 8 03:41:16 2015 +0530

    tdf#74591 : Changes shortcut key "prior" and "next" to "PgUp" and "PgDn"
    
    Adds new handler for Page_Up and Page_Down
    
    Change-Id: If4c40fb920d85996872f0ec9becd1d544c0e5e36
    Reviewed-on: https://gerrit.libreoffice.org/14788
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index c07dd00..746eaad 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -62,6 +62,8 @@ namespace vcl_sal {
         { XK_Control_R, "Ctrl" },
         { XK_Escape, "Esc" },
         { XK_space, "Space" },
+        { XK_Page_Up, "PgUp"},
+        { XK_Page_Down, "PgDn"}
     };
 
     static const struct KeysymNameReplacement aImplReplacements_Turkish[] =
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 29c786d..5e74cff 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -841,10 +841,10 @@ OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
             nKeySym = XK_End;
             break;
         case KEY_PAGEUP:
-            nKeySym = XK_Prior;
+            nKeySym = XK_Page_Up;
             break;
         case KEY_PAGEDOWN:
-            nKeySym = XK_Next;
+            nKeySym = XK_Page_Down;
             break;
         case KEY_RETURN:
             nKeySym = XK_Return;
@@ -1039,10 +1039,10 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
             case XK_KP_Down:
                 nKey = KEY_DOWN;
                 break;
-            case XK_KP_Prior: // XK_KP_Page_Up
+            case XK_KP_Page_Up: // XK_KP_Page_Up
                 nKey = KEY_PAGEUP;
                 break;
-            case XK_KP_Next: // XK_KP_Page_Down
+            case XK_KP_Page_Down: // XK_KP_Page_Down
                 nKey = KEY_PAGEDOWN;
                 break;
             case XK_KP_End:
@@ -1182,10 +1182,10 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
             case XK_Down:
                 nKey = KEY_DOWN;
                 break;
-            case XK_Prior: // XK_Page_Up
+            case XK_Page_Up: // XK_Page_Up
                 nKey = KEY_PAGEUP;
                 break;
-            case XK_Next: // XK_Page_Down
+            case XK_Page_Down: // XK_Page_Down
                 nKey = KEY_PAGEDOWN;
                 break;
             case XK_End: