Argh, the \xNN syntax uses as many hex chars there happens to be...

So use string splicing after a sequence of \xNN. (For consistency
even if it isn't a valid hex character that follows.)

Change-Id: I269788fa5d5fbc4eda5b9edcaaabfcbce59e4885

1 files changed, 25 insertions, 25 deletions

diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx
index 78ced0b533eb..7ec5af42ec44 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -75,30 +75,30 @@ namespace vcl_sal {
         { PAPUGA_KEY_SPACEBAR, "Espaciu" },
         { PAPUGA_KEY_HOME, "Aniciu" },
         { PAPUGA_KEY_UP, "Arriba" },
-        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa1x" },
+        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa1" "x" },
         { PAPUGA_KEY_LEFT, "Izquierda" },
         { PAPUGA_KEY_RIGHT, "Drecha" },
         { PAPUGA_KEY_END, "Fin" },
         { PAPUGA_KEY_DOWN, "Abaxo" },
-        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa1x" },
+        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa1" "x" },
         { PAPUGA_KEY_INSERT, "Ins" },
         { PAPUGA_KEY_DELETE, "Supr" },
-        { PAPUGA_KEY_SHIFT, "May\xc3\xbas" },
+        { PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
     };
 
     static const struct KeysNameReplacement aImplReplacements_Catalan[] =
     {
-        { PAPUGA_KEY_BACK, "Retroc\xc3\xa9s" },
+        { PAPUGA_KEY_BACK, "Retroc\xc3\xa9" "s" },
         { PAPUGA_KEY_ENTER, "Retorn" },
         { PAPUGA_KEY_SPACEBAR, "Espai" },
         { PAPUGA_KEY_HOME, "Inici" },
         { PAPUGA_KEY_UP, "Amunt" },
-        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa0g" },
+        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa0" "g" },
         { PAPUGA_KEY_LEFT, "Esquerra" },
         { PAPUGA_KEY_RIGHT, "Dreta" },
         { PAPUGA_KEY_END, "Fi" },
         { PAPUGA_KEY_DOWN, "Avall" },
-        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa0g" },
+        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa0" "g" },
         { PAPUGA_KEY_INSERT, "Ins" },
         { PAPUGA_KEY_DELETE, "Supr" },
         { PAPUGA_KEY_SHIFT, "Maj" },
@@ -108,29 +108,29 @@ namespace vcl_sal {
     {
         { PAPUGA_KEY_RIGHT, "Nool paremale" },
         { PAPUGA_KEY_LEFT, "Nool vasakule" },
-        { PAPUGA_KEY_UP, "Nool \xc3\xbcles" },
+        { PAPUGA_KEY_UP, "Nool \xc3\xbc" "les" },
         { PAPUGA_KEY_DOWN, "Nool alla" },
-        { PAPUGA_KEY_BACK, "Tagasil\xc3\xbcke" },
+        { PAPUGA_KEY_BACK, "Tagasil\xc3\xbc" "ke" },
         { PAPUGA_KEY_ENTER, "Enter" },
-        { PAPUGA_KEY_SPACEBAR, "T\xc3\xbchik" },
+        { PAPUGA_KEY_SPACEBAR, "T\xc3\xbc" "hik" },
     };
 
     static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
     {
         { PAPUGA_KEY_ESC, "Gr" },
         { PAPUGA_KEY_BACK, "Naikinti" },
-        { PAPUGA_KEY_ENTER, "\xc4\xaevesti" },
+        { PAPUGA_KEY_ENTER, "\xc4\xae" "vesti" },
         { PAPUGA_KEY_SPACEBAR, "Tarpas" },
         { PAPUGA_KEY_HOME, "Prad" },
-        { PAPUGA_KEY_UP, "Auk\xc5\xa1tyn" },
+        { PAPUGA_KEY_UP, "Auk\xc5\xa1" "tyn" },
         { PAPUGA_KEY_PAGEUP, "Psl\xe2\x86\x91" },
-        { PAPUGA_KEY_LEFT, "Kair\xc4\x97n" },
-        { PAPUGA_KEY_RIGHT, "De\xc5\xa1in\xc4\x97n" },
+        { PAPUGA_KEY_LEFT, "Kair\xc4\x97" "n" },
+        { PAPUGA_KEY_RIGHT, "De\xc5\xa1" "in\xc4\x97" "n" },
         { PAPUGA_KEY_END, "Pab" },
-        { PAPUGA_KEY_DOWN, "\xc5\xbdemyn" },
+        { PAPUGA_KEY_DOWN, "\xc5\xbd" "emyn" },
         { PAPUGA_KEY_PAGEDOWN, "Psl\xe2\x86\x93" },
-        { PAPUGA_KEY_INSERT, "\xc4\xaeterpti" },
-        { PAPUGA_KEY_DELETE, "\xc5\xa0al" },
+        { PAPUGA_KEY_INSERT, "\xc4\xae" "terpti" },
+        { PAPUGA_KEY_DELETE, "\xc5\xa0" "al" },
         { PAPUGA_KEY_CONTROL, "Vald" },
         { PAPUGA_KEY_SHIFT, "Lyg2" },
         { PAPUGA_KEY_ALT, "Alt" },
@@ -138,13 +138,13 @@ namespace vcl_sal {
 
     static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
     {
-        { PAPUGA_KEY_ESC, "Ube\xc5\xbenica" },
-        { PAPUGA_KEY_BACK, "Vra\xc4\x8dalka" },
-        { PAPUGA_KEY_ENTER, "Vna\xc5\xa1alka" },
+        { PAPUGA_KEY_ESC, "Ube\xc5\xbe" "nica" },
+        { PAPUGA_KEY_BACK, "Vra\xc4\x8d" "alka" },
+        { PAPUGA_KEY_ENTER, "Vna\xc5\xa1" "alka" },
         { PAPUGA_KEY_SPACEBAR, "Preslednica" },
-        { PAPUGA_KEY_HOME, "Za\xc4\x8detek" },
+        { PAPUGA_KEY_HOME, "Za\xc4\x8d" "etek" },
         { PAPUGA_KEY_UP, "Navzgor" },
-        { PAPUGA_KEY_PAGEUP, "Prej\xc5\xa1nja stran" },
+        { PAPUGA_KEY_PAGEUP, "Prej\xc5\xa1" "nja stran" },
         { PAPUGA_KEY_LEFT, "Levo" },
         { PAPUGA_KEY_RIGHT, "Desno" },
         { PAPUGA_KEY_END, "Konec" },
@@ -164,15 +164,15 @@ namespace vcl_sal {
         { PAPUGA_KEY_SPACEBAR, "Espacio" },
         { PAPUGA_KEY_HOME, "Inicio" },
         { PAPUGA_KEY_UP, "Arriba" },
-        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa1g" },
+        { PAPUGA_KEY_PAGEUP, "Re P\xc3\xa1" "g" },
         { PAPUGA_KEY_LEFT, "Izquierda" },
         { PAPUGA_KEY_RIGHT, "Derecha" },
         { PAPUGA_KEY_END, "Fin" },
         { PAPUGA_KEY_DOWN, "Abajo" },
-        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa1g" },
+        { PAPUGA_KEY_PAGEDOWN, "Av P\xc3\xa1" "g" },
         { PAPUGA_KEY_INSERT, "Ins" },
         { PAPUGA_KEY_DELETE, "Supr" },
-        { PAPUGA_KEY_SHIFT, "May\xc3\xbas" },
+        { PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
     };
 
     static const struct KeysNameReplacement aImplReplacements_Hungarian[] =
@@ -182,7 +182,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_UP, "Fel" },
         { PAPUGA_KEY_DOWN, "Le" },
         { PAPUGA_KEY_ENTER, "Enter" },
-        { PAPUGA_KEY_SPACEBAR, "Sz\xc3\xb3k\xc3\xb6z" },
+        { PAPUGA_KEY_SPACEBAR, "Sz\xc3\xb3" "k\xc3\xb6" "z" },
     };
 
     static const struct KeyboardReplacements aKeyboards[] =