Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 660584 - nsILanguageAtomService.LookupLanguage should use nsACString instead of nsAString. r=smontagu

Browse Source
This commit is contained in:
Makoto Kato 2011-05-31 14:09:05 +09:00
parent 6cae4de3fc
commit 53cc49df1a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/gfxFontconfigUtils.cpp
View File

@ -395,7 +395,7 @@ TryLangForGroup(const nsACString& aOSLang, nsIAtom *aLangGroup,
}
nsIAtom *atom =
gLangService->LookupLanguage(NS_ConvertUTF8toUTF16(*aFcLang));
gLangService->LookupLanguage(*aFcLang);
return atom == aLangGroup;
}

6
intl/locale/public/nsILanguageAtomService.h
View File

@ -52,8 +52,8 @@
#include "nsIAtom.h"
#define NS_ILANGUAGEATOMSERVICE_IID \
{0xE8ABCA7C, 0x3909, 0x4DBC, \
{ 0x9D, 0x03, 0xD3, 0xB5, 0xBE, 0xE4, 0xFD, 0x3F }}
{0xAF4C48CF, 0x8F76, 0x4477, \
{ 0xA7, 0x0E, 0xAB, 0x09, 0x74, 0xE2, 0x41, 0xF0 }}
#define NS_LANGUAGEATOMSERVICE_CONTRACTID \
"@mozilla.org/intl/nslanguageatomservice;1"
@ -63,7 +63,7 @@ class nsILanguageAtomService : public nsISupports
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ILANGUAGEATOMSERVICE_IID)
virtual nsIAtom* LookupLanguage(const nsAString &aLanguage,
virtual nsIAtom* LookupLanguage(const nsACString &aLanguage,
nsresult *aError = nsnull) = 0;
virtual already_AddRefed<nsIAtom>
LookupCharSet(const char *aCharSet, nsresult *aError = nsnull) = 0;

4
intl/locale/src/nsLanguageAtomService.cpp
View File

@ -68,10 +68,10 @@ nsLanguageAtomService::InitLangGroupTable()
}
nsIAtom*
nsLanguageAtomService::LookupLanguage(const nsAString &aLanguage,
nsLanguageAtomService::LookupLanguage(const nsACString &aLanguage,
nsresult *aError)
{
nsAutoString lowered(aLanguage);
nsCAutoString lowered(aLanguage);
ToLowerCase(lowered);
nsCOMPtr<nsIAtom> lang = do_GetAtom(lowered);

2
intl/locale/src/nsLanguageAtomService.h
View File

@ -53,7 +53,7 @@ public:
// nsILanguageAtomService
virtual NS_HIDDEN_(nsIAtom*)
LookupLanguage(const nsAString &aLanguage, nsresult *aError);
LookupLanguage(const nsACString &aLanguage, nsresult *aError);
virtual NS_HIDDEN_(already_AddRefed<nsIAtom>)
LookupCharSet(const char *aCharSet, nsresult *aError);