From 55295eba0a04ee5034ddfad358cf35cd0359028d Mon Sep 17 00:00:00 2001
From: "pedemont%us.ibm.com"
 <pedemont%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 7 Sep 2004 15:16:57 +0000
Subject: [PATCH] nsDateTimeFormatMac broken in Japanese locale.
 r=jshin,sr=roc,a=asa

git-svn-id: svn://10.0.0.236/trunk@161843 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp | 6 +-----
 mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h   | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

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 <nsICharsetConverterManager>  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;