Adapt to no-longer explicit OUStringLiteral ctor

...from previous commit

Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f
Reviewed-on: https://gerrit.libreoffice.org/32098
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 46 insertions, 97 deletions

diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index d4c3c77e0fcc..448d7b82ccbe 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -32,103 +32,52 @@ namespace
 
 std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] =
 {
-    {OUStringLiteral("MacArabic"), OUStringLiteral("Arabic (Apple Macintosh)")},
-    {OUStringLiteral("CP864"), OUStringLiteral("Arabic (DOS/OS2-864)")},
-    {OUStringLiteral("CP1006"), OUStringLiteral("Arabic (IBM-1006)")},
-    {OUStringLiteral("CP1256"), OUStringLiteral("Arabic (Windows-1256)")},
-    {OUStringLiteral("CP775"), OUStringLiteral("Baltic (DOS/OS2-775)")},
-    {OUStringLiteral("CP1257"), OUStringLiteral("Baltic (Windows-1257)")},
-    {OUStringLiteral("MacCeltic"), OUStringLiteral("Celtic (Apple Macintosh)")},
-    {
-        OUStringLiteral("MacCyrillic"),
-        OUStringLiteral("Cyrillic (Apple Macintosh)")
-    },
-    {OUStringLiteral("CP855"), OUStringLiteral("Cyrillic (DOS/OS2-855)")},
-    {
-        OUStringLiteral("CP866"),
-        OUStringLiteral("Cyrillic (DOS/OS2-866/Russian)")
-    },
-    {OUStringLiteral("CP1251"), OUStringLiteral("Cyrillic (Windows-1251)")},
-    {
-        OUStringLiteral("MacCEurope"),
-        OUStringLiteral("Eastern Europe (Apple Macintosh)")
-    },
-    {
-        OUStringLiteral("MacCroatian"),
-        OUStringLiteral("Eastern Europe (Apple Macintosh/Croatian)")
-    },
-    {
-        OUStringLiteral("MacRomanian"),
-        OUStringLiteral("Eastern Europe (Apple Macintosh/Romanian)")
-    },
-    {OUStringLiteral("CP852"), OUStringLiteral("Eastern Europe (DOS/OS2-852)")},
-    {
-        OUStringLiteral("CP1250"),
-        OUStringLiteral("Eastern Europe (Windows-1250/WinLatin 2)")
-    },
-    {OUStringLiteral("MacGreek"), OUStringLiteral("Greek (Apple Macintosh)")},
-    {OUStringLiteral("CP737"), OUStringLiteral("Greek (DOS/OS2-737)")},
-    {OUStringLiteral("CP869"), OUStringLiteral("Greek (DOS/OS2-869/Greek-2)")},
-    {OUStringLiteral("CP875"), OUStringLiteral("Greek (DOS/OS2-875)")},
-    {OUStringLiteral("CP1253"), OUStringLiteral("Greek (Windows-1253)")},
-    {OUStringLiteral("MacHebrew"), OUStringLiteral("Hebrew (Apple Macintosh)")},
-    {OUStringLiteral("CP424"), OUStringLiteral("Hebrew (DOS/OS2-424)")},
-    {OUStringLiteral("CP856"), OUStringLiteral("Hebrew (DOS/OS2-856)")},
-    {OUStringLiteral("CP862"), OUStringLiteral("Hebrew (DOS/OS2-862)")},
-    {OUStringLiteral("CP1255"), OUStringLiteral("Hebrew (Windows-1255)")},
-    {OUStringLiteral("CP500"), OUStringLiteral("International (DOS/OS2-500)")},
-    {OUStringLiteral("CP932"), OUStringLiteral("Japanese (Windows-932)")},
-    {OUStringLiteral("MacThai"), OUStringLiteral("Thai (Apple Macintosh)")},
-    {OUStringLiteral("CP874"), OUStringLiteral("Thai (DOS/OS2-874)")},
-    {
-        OUStringLiteral("CP950"),
-        OUStringLiteral("Traditional Chinese (Windows-950)")
-    },
-    {
-        OUStringLiteral("MacTurkish"),
-        OUStringLiteral("Turkish (Apple Macintosh)")
-    },
-    {OUStringLiteral("CP857"), OUStringLiteral("Turkish (DOS/OS2-857)")},
-    {OUStringLiteral("CP1026"), OUStringLiteral("Turkish (DOS/OS2-1026)")},
-    {OUStringLiteral("CP1254"), OUStringLiteral("Turkish (Windows-1254)")},
-    {OUStringLiteral("CP1258"), OUStringLiteral("Vietnamese (Windows-1258)")},
-    {
-        OUStringLiteral("MacRoman"),
-        OUStringLiteral("Western Europe (Apple Macintosh)")
-    },
-    {
-        OUStringLiteral("MacIceland"),
-        OUStringLiteral("Western Europe (Apple Macintosh/Icelandic)")
-    },
-    {
-        OUStringLiteral("CP037"),
-        OUStringLiteral("Western Europe (DOS/OS2-037/US-Canada)")
-    },
-    {
-        OUStringLiteral("CP437"),
-        OUStringLiteral("Western Europe (DOS/OS2-437/US)")
-    },
-    {OUStringLiteral("CP850"), OUStringLiteral("Western Europe (DOS/OS2-850)")},
-    {
-        OUStringLiteral("CP860"),
-        OUStringLiteral("Western Europe (DOS/OS2-860/Portuguese)")
-    },
-    {
-        OUStringLiteral("CP861"),
-        OUStringLiteral("Western Europe (DOS/OS2-861/Icelandic)")
-    },
-    {
-        OUStringLiteral("CP863"),
-        OUStringLiteral("Western Europe (DOS/OS2-863/French)")
-    },
-    {
-        OUStringLiteral("CP865"),
-        OUStringLiteral("Western Europe (DOS/OS2-865/Nordic)")
-    },
-    {
-        OUStringLiteral("CP1252"),
-        OUStringLiteral("Western Europe (Windows-1252/WinLatin 1)")
-    }
+    {"MacArabic", "Arabic (Apple Macintosh)"},
+    {"CP864", "Arabic (DOS/OS2-864)"},
+    {"CP1006", "Arabic (IBM-1006)"},
+    {"CP1256", "Arabic (Windows-1256)"},
+    {"CP775", "Baltic (DOS/OS2-775)"},
+    {"CP1257", "Baltic (Windows-1257)"},
+    {"MacCeltic", "Celtic (Apple Macintosh)"},
+    {"MacCyrillic", "Cyrillic (Apple Macintosh)"},
+    {"CP855", "Cyrillic (DOS/OS2-855)"},
+    {"CP866", "Cyrillic (DOS/OS2-866/Russian)"},
+    {"CP1251", "Cyrillic (Windows-1251)"},
+    {"MacCEurope", "Eastern Europe (Apple Macintosh)"},
+    {"MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)"},
+    {"MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)"},
+    {"CP852", "Eastern Europe (DOS/OS2-852)"},
+    {"CP1250", "Eastern Europe (Windows-1250/WinLatin 2)"},
+    {"MacGreek", "Greek (Apple Macintosh)"},
+    {"CP737", "Greek (DOS/OS2-737)"},
+    {"CP869", "Greek (DOS/OS2-869/Greek-2)"},
+    {"CP875", "Greek (DOS/OS2-875)"},
+    {"CP1253", "Greek (Windows-1253)"},
+    {"MacHebrew", "Hebrew (Apple Macintosh)"},
+    {"CP424", "Hebrew (DOS/OS2-424)"},
+    {"CP856", "Hebrew (DOS/OS2-856)"},
+    {"CP862", "Hebrew (DOS/OS2-862)"},
+    {"CP1255", "Hebrew (Windows-1255)"},
+    {"CP500", "International (DOS/OS2-500)"},
+    {"CP932", "Japanese (Windows-932)"},
+    {"MacThai", "Thai (Apple Macintosh)"},
+    {"CP874", "Thai (DOS/OS2-874)"},
+    {"CP950", "Traditional Chinese (Windows-950)"},
+    {"MacTurkish", "Turkish (Apple Macintosh)"},
+    {"CP857", "Turkish (DOS/OS2-857)"},
+    {"CP1026", "Turkish (DOS/OS2-1026)"},
+    {"CP1254", "Turkish (Windows-1254)"},
+    {"CP1258", "Vietnamese (Windows-1258)"},
+    {"MacRoman", "Western Europe (Apple Macintosh)"},
+    {"MacIceland", "Western Europe (Apple Macintosh/Icelandic)"},
+    {"CP037", "Western Europe (DOS/OS2-037/US-Canada)"},
+    {"CP437", "Western Europe (DOS/OS2-437/US)"},
+    {"CP850", "Western Europe (DOS/OS2-850)"},
+    {"CP860", "Western Europe (DOS/OS2-860/Portuguese)"},
+    {"CP861", "Western Europe (DOS/OS2-861/Icelandic)"},
+    {"CP863", "Western Europe (DOS/OS2-863/French)"},
+    {"CP865", "Western Europe (DOS/OS2-865/Nordic)"},
+    {"CP1252", "Western Europe (Windows-1252/WinLatin 1)"}
 };
 
 std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings);