Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

argh, one more set of fixes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@143600 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%flett.org
2003-06-11 20:31:43 +00:00
parent c860e2f52e
commit 8fcaadeb64
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/intl/uconv/src/nsMacCharset.cpp
View File

@@ -86,10 +86,10 @@ nsresult nsPlatformCharset::MapToCharset(short script, short region, nsACString&
case verUS:
case verFrance:
case verGermany:
outCharset.Assign(NS_LITERAL_STRING("x-mac-roman"));
outCharset.Assign(NS_LITERAL_CSTRING("x-mac-roman"));
return NS_OK;
case verJapan:
outCharset.Assign(NS_LITERAL_STRING("Shift_JIS"));
outCharset.Assign(NS_LITERAL_CSTRING("Shift_JIS"));
return NS_OK;
}
@@ -101,14 +101,19 @@ nsresult nsPlatformCharset::MapToCharset(short script, short region, nsACString&
nsAutoString key(NS_LITERAL_STRING("region."));
key.AppendInt(region, 10);
rv = gInfo->Get(key, outCharset);
if (NS_FAILED(rv)) {
nsAutoString uCharset;
rv = gInfo->Get(key, uCharset);
if (NS_SUCCEEDED(rv))
CopyUCS2toASCII(uCharset, outCharset);
else {
key.Assign(NS_LITERAL_STRING("script."));
key.AppendInt(script, 10);
rv = gInfo->Get(key, outCharset);
rv = gInfo->Get(key, uCharset);
// not found in the .property file, assign x-mac-roman
if (NS_FAILED(rv)) {
outCharset.Assign(NS_LITERAL_STRING("x-mac-roman"));
if (NS_SUCCEEDED(rv))
CopyUCS2toASCII(uCharset, outCharset);
else {
outCharset.Assign(NS_LITERAL_CSTRING("x-mac-roman"));
}
}
@@ -130,7 +135,7 @@ nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult
switch (selector) {
#ifdef XP_MACOSX
case kPlatformCharsetSel_FileName:
oResult.Assign(NS_LITERAL_STRING("UTF-8"));
oResult.Assign(NS_LITERAL_CSTRING("UTF-8"));
break;
#endif
case kPlatformCharsetSel_KeyboardInput:
@@ -151,7 +156,8 @@ NS_IMETHODIMP
nsPlatformCharset::GetDefaultCharsetForLocale(const PRUnichar* localeName, PRUnichar** _retValue)
{
nsCOMPtr<nsIMacLocale> pMacLocale;
nsAutoString localeAsString(localeName), charset(NS_LITERAL_STRING("x-mac-roman"));
nsAutoString localeAsString(localeName);
nsCAutoString charset(NS_LITERAL_CSTRING("x-mac-roman"));
short script, language, region;
nsresult rv;