diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp index 3856774e3cb..cca1ac6d0ff 100644 --- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp +++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp @@ -301,9 +301,6 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) if (NS_SUCCEEDED(res)) { mCharset = mappedCharset; } - - // get a system charset (used when getting date/time strings as default) - res = platformCharset->GetCharset(kPlatformCharsetSel_FileName, mSystemCharset); } } @@ -312,8 +309,7 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) nsCOMPtr charsetConverterManager; charsetConverterManager = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); if (NS_SUCCEEDED(res)) { - res = charsetConverterManager->GetUnicodeDecoder(mUseDefaultLocale ? mSystemCharset.get() : - mCharset.get(), + res = charsetConverterManager->GetUnicodeDecoder(mCharset.get(), getter_AddRefs(mDecoder)); } diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h index d76bbd0a7c5..54be53f1b07 100644 --- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h +++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h @@ -88,7 +88,6 @@ private: nsString mLocale; nsString mAppLocale; nsCString mCharset; - nsCString mSystemCharset; short mScriptcode; short mLangcode; short mRegioncode;