From 51aabc846056f4e400be8defff08f70fa92baf02 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Thu, 28 Oct 2004 02:27:25 +0000 Subject: [PATCH] Bug 207333 Fix nsIWin32LocaleImpl r=smontagu sr=dbaron git-svn-id: svn://10.0.0.236/trunk@164538 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/locale/src/nsLocaleService.cpp | 2 +- mozilla/intl/uconv/src/nsWinCharset.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/intl/locale/src/nsLocaleService.cpp b/mozilla/intl/locale/src/nsLocaleService.cpp index b9615b5ee5e..ee12418fcc7 100644 --- a/mozilla/intl/locale/src/nsLocaleService.cpp +++ b/mozilla/intl/locale/src/nsLocaleService.cpp @@ -40,7 +40,7 @@ #include "nsILocaleService.h" #include "nsLocale.h" #include "nsLocaleCID.h" -#include "nsIComponentManager.h" +#include "nsIServiceManagerUtils.h" #include "nsReadableUtils.h" #include "nsCRT.h" #include "prprf.h" diff --git a/mozilla/intl/uconv/src/nsWinCharset.cpp b/mozilla/intl/uconv/src/nsWinCharset.cpp index aba1b5ba08a..3440afb6b6c 100644 --- a/mozilla/intl/uconv/src/nsWinCharset.cpp +++ b/mozilla/intl/uconv/src/nsWinCharset.cpp @@ -44,7 +44,7 @@ #include "nsCOMPtr.h" #include "nsReadableUtils.h" #include "nsLocaleCID.h" -#include "nsIComponentManager.h" +#include "nsIServiceManagerUtils.h" #include "nsITimelineService.h" #include "nsPlatformCharset.h" @@ -142,7 +142,7 @@ nsPlatformCharset::GetDefaultCharsetForLocale(const nsAString& localeName, nsACS nsresult rv; oResult.Truncate(); - winLocale = do_CreateInstance(NS_WIN32LOCALE_CONTRACTID, &rv); + winLocale = do_GetService(NS_WIN32LOCALE_CONTRACTID, &rv); if (NS_FAILED(rv)) { return rv; } rv = winLocale->GetPlatformLocale(localeName, &localeAsLCID);