You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/01/31 11:58:05 UTC
svn commit: r1440903 - in /openoffice/trunk/main/vcl/unx/generic:
app/saldisp.cxx dtrans/X11_selection.cxx
Author: hdu
Date: Thu Jan 31 10:58:04 2013
New Revision: 1440903
URL: http://svn.apache.org/viewvc?rev=1440903&view=rev
Log:
XKeycodeToKeysym() was officially deprecated in 2011
XkbKeycodeToKeysym() has obsoleted it in 2003 anyway
Modified:
openoffice/trunk/main/vcl/unx/generic/app/saldisp.cxx
openoffice/trunk/main/vcl/unx/generic/dtrans/X11_selection.cxx
Modified: openoffice/trunk/main/vcl/unx/generic/app/saldisp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/app/saldisp.cxx?rev=1440903&r1=1440902&r2=1440903&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/app/saldisp.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/app/saldisp.cxx Thu Jan 31 10:58:04 2013
@@ -1056,9 +1056,9 @@ inline KeySym sal_XModifier2Keysym( Disp
XModifierKeymap *pXModMap,
int n )
{
- return XKeycodeToKeysym( pDisplay,
+ return XkbKeycodeToKeysym( pDisplay,
pXModMap->modifiermap[n*pXModMap->max_keypermod],
- 0 );
+ 0, 0 );
}
void SalDisplay::ModifierMapping()
@@ -1737,7 +1737,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent
// 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;
}
Modified: openoffice/trunk/main/vcl/unx/generic/dtrans/X11_selection.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/dtrans/X11_selection.cxx?rev=1440903&r1=1440902&r2=1440903&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/dtrans/X11_selection.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/dtrans/X11_selection.cxx Thu Jan 31 10:58:04 2013
@@ -2724,8 +2724,8 @@ bool SelectionManager::handleDragEvent(
}
else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
{
- bHandled = true;
- KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
+ bHandled = true;
+ const KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0, 0 );
if( aKey == XK_Escape )
{
// abort drag