keysymnames: get rid of some insanity

getKeysymReplacementName() returned a translated keyname, now
XKeysymToString() is called directly. This change had no negative
effect to me. I tried it with a fixed string as return value for
getKeysymReplacementName() on a german interface. INSRT is still
translated to EINFG as this is done by po files.

vcl/inc/unx/saldisp.hxx

@@ -470,17 +470,6 @@ public:
     void                SetupInput( SalI18N_InputMethod *pInputMethod );
 };
 
-/*----------------------------------------------------------
- keep track of correct size of the initial window
- */
-// get foreign key names
-namespace vcl_sal {
-    rtl::OUString getKeysymReplacementName(
-        const char* pKeyboard,
-        KeySym nSymbol );
-}
-
-
 #endif // _SV_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/generic/app/saldisp.cxx

@@ -954,16 +954,13 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
             aRet = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ) );
         else
         {
-            aRet = ::vcl_sal::getKeysymReplacementName( const_cast<SalDisplay*>(this)->GetKeyboardName(), nKeySym );
-            if( aRet.isEmpty() )
-            {
-                const char *pString = XKeysymToString( nKeySym );
-                int n = strlen( pString );
-                if( n > 2 && pString[n-2] == '_' )
-                    aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
-                else
-                    aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
-            }
+            const char *pString = XKeysymToString( nKeySym );
+            int n = strlen( pString );
+
+            if( n > 2 && pString[n-2] == '_' )
+                aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
+            else
+                aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
         }
     }
     return aRet;