[Libreoffice-commits] .: vcl/unx

[Julien Nabet]

 vcl/unx/generic/app/saldisp.cxx          |    6 +++---
 vcl/unx/generic/dtrans/X11_selection.cxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 18e6e7d929c2be209407ed2e56b8ec4d5e6c4900
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon May 14 18:59:35 2012 +0200

    WaE : XKeycodeToKeysym deprecated
    
    Replaced by XkbKeycodeToKeysym
    (cf http://nabble.documentfoundation.org/PATCH-Proposed-patch-for-XKeycodeToKeysym-deprecated-td3978158.html)
    
    Change-Id: Ide8331705369d0c38e72bfe693102625e62a87e1

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d6060d5..ee4f094 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -782,9 +782,9 @@ inline KeySym sal_XModifier2Keysym( Display         *pDisplay,
                                     XModifierKeymap *pXModMap,
                                     int              n )
 {
-    return XKeycodeToKeysym( pDisplay,
+    return XkbKeycodeToKeysym( pDisplay,
                              pXModMap->modifiermap[n*pXModMap->max_keypermod],
-                             0 );
+                             0,0 );
 }
 
 void SalDisplay::ModifierMapping()
@@ -1483,7 +1483,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent        *pEvent,
 
     // Now get the unmodified KeySym for KeyCode retrieval
     // try to strip off modifiers, e.g. Ctrl-$ becomes Ctrl-Shift-4
-    *pUnmodifiedKeySym  = XKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0);
+    *pUnmodifiedKeySym  = XkbKeycodeToKeysym( GetDisplay(), pEvent->keycode, 0, 0);
 
     return nKeySym;
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 0bb3527..1c4faae 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -2731,7 +2731,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
     else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
     {
         bHandled = true;
-        KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
+        KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0, 0 );
         if( aKey == XK_Escape )
         {
             // abort drag