mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerperfect: fix gcc-4.7 build

Browse Source 
error: could not convert '(const char*)"..."' from 'const char*' to 'const rtl::OUString'

Change-Id: Ia8569aed46e571bd98489fd91b9708d0fe5df4c0
This commit is contained in:
Miklos Vajna
2015-06-10 09:12:12 +02:00
parent a861a234b0
commit 3f50c6ee4b
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
writerperfect/source/common/WPFTEncodingDialog.cxx
View File

@@ -38,50 +38,50 @@ struct EncodingImplementation
OUString const(EncodingImplementation::s_encodings[])=
{
"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)",
"MacThai", "Thai (Apple Macintosh)",
"CP874", "Thai (DOS/OS2-874)",
"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)"
OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"),
OUString("CP864"), OUString("Arabic (DOS/OS2-864)"),
OUString("CP1006"), OUString("Arabic (IBM-1006)"),
OUString("CP1256"), OUString("Arabic (Windows-1256)"),
OUString("CP775"), OUString("Baltic (DOS/OS2-775)"),
OUString("CP1257"), OUString("Baltic (Windows-1257)"),
OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"),
OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"),
OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"),
OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"),
OUString("CP1251"), OUString("Cyrillic (Windows-1251)"),
OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"),
OUString("MacCroatian"), OUString("Eastern Europe (Apple Macintosh/Croatian)"),
OUString("MacRomanian"), OUString("Eastern Europe (Apple Macintosh/Romanian)"),
OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"),
OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"),
OUString("MacGreek"), OUString("Greek (Apple Macintosh)"),
OUString("CP737"), OUString("Greek (DOS/OS2-737)"),
OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"),
OUString("CP875"), OUString("Greek (DOS/OS2-875)"),
OUString("CP1253"), OUString("Greek (Windows-1253)"),
OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"),
OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"),
OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"),
OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"),
OUString("CP1255"), OUString("Hebrew (Windows-1255)"),
OUString("CP500"), OUString("International (DOS/OS2-500)"),
OUString("MacThai"), OUString("Thai (Apple Macintosh)"),
OUString("CP874"), OUString("Thai (DOS/OS2-874)"),
OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"),
OUString("CP857"), OUString("Turkish (DOS/OS2-857)"),
OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"),
OUString("CP1254"), OUString("Turkish (Windows-1254)"),
OUString("CP1258"), OUString("Vietnamese (Windows-1258)"),
OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"),
OUString("MacIceland"), OUString("Western Europe (Apple Macintosh/Icelandic)"),
OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"),
OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"),
OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"),
OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"),
OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"),
OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"),
OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"),
OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)")
};
inline int EncodingImplementation::numEncodings()