INTEGRATION: CWS gslpatches3 (1.11.318); FILE MERGED

2005/06/16 11:05:21 pl 1.11.318.1: #i50812# beauty patch (thanks to mmeeks)

1 files changed, 20 insertions, 20 deletions

diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 053387793eb5..20c0f5d027d8 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: keysymnames.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-23 10:06:00 $
+ *  last change: $Author: obo $ $Date: 2005-08-09 11:02:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,17 +130,17 @@ namespace vcl_sal {
         { XK_Left, "Links" },
         { XK_Up, "Oben" },
         { XK_Down, "Unten" },
-        { XK_BackSpace, "Rückschritt" },
+        { XK_BackSpace, "R�ckschritt" },
         { XK_Return, "Eingabe" },
-        { XK_slash, "Schrägstrich" },
+        { XK_slash, "Schr�gstrich" },
         { XK_space, "Leertaste" },
         { SunXK_Stop,  "Stop" },
         { SunXK_Again, "Wiederholen" },
         { SunXK_Props, "Eigenschaften" },
-        { SunXK_Undo,  "Zurücknehmen" },
+        { SunXK_Undo,  "Zur�cknehmen" },
         { SunXK_Front, "Vordergrund" },
         { SunXK_Copy,  "Kopieren" },
-        { SunXK_Open,  "Öffnen" },
+        { SunXK_Open,  "�ffnen" },
         { SunXK_Paste, "Einsetzen" },
         { SunXK_Find,  "Suchen" },
         { SunXK_Cut,   "Ausschneiden" }
@@ -150,11 +150,11 @@ namespace vcl_sal {
     {
         { XK_Shift_L, "Maj" },
         { XK_Shift_R, "Maj" },
-        { XK_Page_Up, "Pg. Préc" },
+        { XK_Page_Up, "Pg. Pr�c" },
         { XK_Page_Down, "Pg. Suiv" },
         { XK_End, "Fin" },
         { XK_Home, "Origine" },
-        { XK_Insert, "Insérer" },
+        { XK_Insert, "Ins�rer" },
         { XK_Delete, "Suppr" },
         { XK_Escape, "Esc" },
         { XK_Right, "Droite" },
@@ -163,7 +163,7 @@ namespace vcl_sal {
         { XK_Down, "Bas" },
         { XK_BackSpace, "Ret. Arr" },
         { XK_Return, "Retour" },
-        { XK_KP_Enter, "Entrée" },
+        { XK_KP_Enter, "Entr�e" },
         { SunXK_Stop,  "Stop" },
         { SunXK_Again, "Encore" },
         { SunXK_Props, "Props" },
@@ -195,7 +195,7 @@ namespace vcl_sal {
         { XK_space, "Spaziatrice" },
         { SunXK_Stop,  "Stop" },
         { SunXK_Again, "Ancora" },
-        { SunXK_Props, "Proprietà" },
+        { SunXK_Props, "Propriet�" },
         { SunXK_Undo,  "Annulla" },
         { SunXK_Front, "Davanti" },
         { SunXK_Copy,  "Copia" },
@@ -248,9 +248,9 @@ namespace vcl_sal {
         { SunXK_Undo,  "Angre" },
         { SunXK_Front, "Front" },
         { SunXK_Copy,  "Kopi" },
-        { SunXK_Open,  "Åpne" },
+        { SunXK_Open,  "�pne" },
         { SunXK_Paste, "Lim" },
-        { SunXK_Find,  "Søk" },
+        { SunXK_Find,  "S�k" },
         { SunXK_Cut,   "Klipp" }
     };
 
@@ -261,8 +261,8 @@ namespace vcl_sal {
         { XK_Page_Up, "PageUp" },
         { XK_Page_Down, "PageDown" },
         { XK_Escape, "Esc" },
-        { XK_Right, "Höger" },
-        { XK_Left, "Vänster" },
+        { XK_Right, "H�ger" },
+        { XK_Left, "V�nster" },
         { XK_Up, "Up" },
         { XK_Down, "Ned" },
         { XK_BackSpace, "Backsteg" },
@@ -271,12 +271,12 @@ namespace vcl_sal {
         { SunXK_Stop,  "Avbryt" },
         { SunXK_Again, "Upprepa" },
         { SunXK_Props, "Egenskaper" },
-        { SunXK_Undo,  "Ångra" },
+        { SunXK_Undo,  "�ngra" },
         { SunXK_Front, "Fram" },
         { SunXK_Copy,  "Kopiera" },
-        { SunXK_Open,  "Öppna" },
+        { SunXK_Open,  "�ppna" },
         { SunXK_Paste, "Klistra in" },
-        { SunXK_Find,  "Sök" },
+        { SunXK_Find,  "S�k" },
         { SunXK_Cut,   "Klipp ut" }
     };
 
@@ -308,8 +308,8 @@ namespace vcl_sal {
     {
         { XK_Shift_L, "Mayos" },
         { XK_Shift_R, "Mayos" },
-        { XK_Page_Up, "RePág" },
-        { XK_Page_Down, "AvPág" },
+        { XK_Page_Up, "ReP�g" },
+        { XK_Page_Down, "AvP�g" },
         { XK_End, "Fin" },
         { XK_Home, "Inicio" },
         { XK_Delete, "Supr" },
@@ -646,7 +646,7 @@ const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
                 for( i = 0; i < XkbNumKbdGroups; i++ )
                     PRINT_ATOM_2( groups );
 #endif
-                XkbFreeKeyboard( pXkbDesc, 0, True );
+                XkbFreeKeyboard( pXkbDesc, XkbAllComponentsMask, True );
             }
         }
         if( ! m_aKeyboardName.Len() )