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

bug 225106 : remove redundant charset alias resoultion code (r=smontagu, sr=bz)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149058 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jshin%mailaps.org
2003-11-09 05:45:21 +00:00
parent d256e525a6
commit e262e13b47
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
View File

@@ -431,7 +431,9 @@ nsCharsetConverterManager::GetCharsetLangGroup(const char * aCharset,
{
// resolve the charset first
nsCAutoString charset;
GetCharsetAlias(aCharset, charset);
nsresult rv = GetCharsetAlias(aCharset, charset);
if (NS_FAILED(rv)) return rv;
// fully qualify to possibly avoid vtable call
return nsCharsetConverterManager::GetCharsetLangGroupRaw(charset.get(),
@@ -452,13 +454,8 @@ nsCharsetConverterManager::GetCharsetLangGroupRaw(const char * aCharset,
if (NS_FAILED(res)) return res;
}
nsCAutoString alias;
res = GetCharsetAlias(aCharset, alias);
if (NS_FAILED(res)) return res;
nsAutoString langGroup;
res = GetBundleValue(mDataBundle, alias.get(), NS_LITERAL_STRING(".LangGroup"), langGroup);
res = GetBundleValue(mDataBundle, aCharset, NS_LITERAL_STRING(".LangGroup"), langGroup);
*aResult = NS_NewAtom(langGroup);
return res;