mozilla diffs r=tao, sr=alecf, commercial diffs r=syd, sr=syd/shaver. lower-casing JS calls to createBundle. removing un-used nsILocale param from nsIStringBundle::CreateBundle(). 76332
git-svn-id: svn://10.0.0.236/trunk@93306 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -68,7 +68,6 @@
|
||||
#include "nsIProgressEventSink.h"
|
||||
#include "nsIWebProgress.h"
|
||||
#include "nsILayoutHistoryState.h"
|
||||
#include "nsILocaleService.h"
|
||||
#include "nsITimer.h"
|
||||
#include "nsIFileStream.h"
|
||||
#include "nsISHistoryInternal.h"
|
||||
@@ -4723,20 +4722,12 @@ nsDocShell::GetPromptAndStringBundle(nsIPrompt ** aPrompt,
|
||||
NS_ENSURE_SUCCESS(GetInterface(NS_GET_IID(nsIPrompt), (void **) aPrompt),
|
||||
NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsILocaleService>
|
||||
localeService(do_GetService(NS_LOCALESERVICE_CONTRACTID));
|
||||
NS_ENSURE_TRUE(localeService, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsILocale> locale;
|
||||
localeService->GetSystemLocale(getter_AddRefs(locale));
|
||||
NS_ENSURE_TRUE(locale, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsIStringBundleService>
|
||||
stringBundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID));
|
||||
NS_ENSURE_TRUE(stringBundleService, NS_ERROR_FAILURE);
|
||||
|
||||
NS_ENSURE_SUCCESS(stringBundleService->
|
||||
CreateBundle(DIALOG_STRING_URI, locale,
|
||||
CreateBundle(DIALOG_STRING_URI,
|
||||
getter_AddRefs(aStringBundle)),
|
||||
NS_ERROR_FAILURE);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user