Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changeset d9c4a4d5a4e4 (bug 441167)

Browse Source
This commit is contained in:
Simon Montagu 2009-01-21 12:27:39 +02:00
parent e01887b2a7
commit c15f54734f
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intl/locale/src/nsScriptableDateFormat.cpp
View File

@ -46,7 +46,6 @@
#include "nsIScriptableDateFormat.h" #include "nsIScriptableDateFormat.h"
#include "nsCRT.h" #include "nsCRT.h"
#include "nsReadableUtils.h" #include "nsReadableUtils.h"
#include "nsIPrefService.h"
static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
@ -115,19 +114,14 @@ NS_IMETHODIMP nsScriptableDateFormat::FormatDateTime(
nsCOMPtr<nsILocale> locale; nsCOMPtr<nsILocale> locale;
// re-initialise locale pointer only if the locale was given explicitly // re-initialise locale pointer only if the locale was given explicitly
if (localeName.IsEmpty()) { if (!localeName.IsEmpty()) {
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); // get locale service
nsCOMPtr<nsILocaleService> localeService(do_GetService(kLocaleServiceCID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
// get locale
rv = localeService->NewLocale(localeName, getter_AddRefs(locale));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCString cLocaleName;
rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(cLocaleName));
CopyUTF8toUTF16(cLocaleName, localeName);
} }
// get locale service
nsCOMPtr<nsILocaleService> localeService(do_GetService(kLocaleServiceCID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
// get locale
rv = localeService->NewLocale(localeName, getter_AddRefs(locale));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDateTimeFormat> dateTimeFormat(do_CreateInstance(kDateTimeFormatCID, &rv)); nsCOMPtr<nsIDateTimeFormat> dateTimeFormat(do_CreateInstance(kDateTimeFormatCID, &rv));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);