diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index 23d05bf46f0..a1da7b6bcda 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -1159,9 +1159,8 @@ Localize(char *genericString, nsString &result) nsCRT::free(spec); return ret; } - nsILocale *locale = nsnull; nsIStringBundle *bundle = nsnull; - ret = pStringService->CreateBundle(spec, locale, &bundle); + ret = pStringService->CreateBundle(spec, &bundle); nsCRT::free(spec); nsServiceManager::ReleaseService(kStringBundleServiceCID, pStringService); if (NS_FAILED(ret)) { diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index d254a59f088..a6fe87a54eb 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -468,8 +468,7 @@ nsresult nsImageDocument::UpdateTitle( void ) // Create a bundle for the localization NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { - nsCOMPtr locale = nsnull; - rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, locale, getter_AddRefs(bundle)); + rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle)); } if (NS_SUCCEEDED(rv) && bundle) { nsAutoString key; diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index b26326d1015..83b710c1248 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -67,7 +67,6 @@ #include "nsIProgressEventSink.h" #include "nsIWebProgress.h" #include "nsILayoutHistoryState.h" -#include "nsILocaleService.h" #include "nsITimer.h" #include "nsIFileStream.h" #include "nsISHistoryInternal.h" @@ -4289,7 +4288,6 @@ NS_IMETHODIMP nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, PRUint32 aLoadTyp NS_ENSURE_SUCCESS(hEntry->GetURI(getter_AddRefs(uri)), NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(aEntry->GetReferrerURI(getter_AddRefs(referrerURI)), NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(aEntry->GetPostData(getter_AddRefs(postData)), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(InternalLoad(uri, referrerURI, nsnull, PR_TRUE, PR_FALSE, nsnull, postData, nsnull, aLoadType, aEntry), NS_ERROR_FAILURE); @@ -4521,17 +4519,10 @@ NS_IMETHODIMP nsDocShell::GetPromptAndStringBundle(nsIPrompt** aPrompt, { NS_ENSURE_SUCCESS(GetInterface(NS_GET_IID(nsIPrompt), (void**)aPrompt), NS_ERROR_FAILURE); - nsCOMPtr localeService(do_GetService(NS_LOCALESERVICE_CONTRACTID)); - NS_ENSURE_TRUE(localeService, NS_ERROR_FAILURE); - - nsCOMPtr locale; - localeService->GetSystemLocale(getter_AddRefs(locale)); - NS_ENSURE_TRUE(locale, NS_ERROR_FAILURE); - nsCOMPtr stringBundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID)); NS_ENSURE_TRUE(stringBundleService, NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(stringBundleService->CreateBundle(DIALOG_STRING_URI, locale, + NS_ENSURE_SUCCESS(stringBundleService->CreateBundle(DIALOG_STRING_URI, getter_AddRefs(aStringBundle)), NS_ERROR_FAILURE); return NS_OK; diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index a9a18e8f180..f02e9204af8 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -296,8 +296,7 @@ nsEditorShell::Init() NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); return res; } - nsILocale* aLocale = nsnull; - res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, aLocale, getter_AddRefs(mStringBundle)); + res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, getter_AddRefs(mStringBundle)); // XXX: why are we returning NS_OK here rather than res? // is it ok to fail to get a string bundle? if so, it should be documented. diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index a9a18e8f180..f02e9204af8 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -296,8 +296,7 @@ nsEditorShell::Init() NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); return res; } - nsILocale* aLocale = nsnull; - res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, aLocale, getter_AddRefs(mStringBundle)); + res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, getter_AddRefs(mStringBundle)); // XXX: why are we returning NS_OK here rather than res? // is it ok to fail to get a string bundle? if so, it should be documented. diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index d63ca86a2ea..0c1e0f14bc5 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/embedding/base/nsEmbedAPI.cpp @@ -141,8 +141,7 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, { nsCOMPtr stringBundle; char* propertyURL = "chrome://necko/locale/necko.properties"; - nsILocale *locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, + rv = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } #endif diff --git a/mozilla/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js b/mozilla/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js index 22628fab799..e280a729f6f 100644 --- a/mozilla/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js +++ b/mozilla/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js @@ -96,7 +96,7 @@ nsHelperAppDialog.prototype = { .createInstance( nsIFilePicker ); var bundle = Components.classes[ "@mozilla.org/intl/stringbundle;1" ] .getService( Components.interfaces.nsIStringBundleService ) - .CreateBundle( "chrome://global/locale/helperAppLauncher.properties", null ); + .createBundle( "chrome://global/locale/helperAppLauncher.properties"); var windowTitle = bundle.GetStringFromName( "saveDialogTitle" ); diff --git a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp index 0e4a2c150df..ca5a1736b49 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp @@ -20,7 +20,6 @@ * Contributor(s): */ -#include "nsILocale.h" #include "nsIServiceManager.h" #include "nsIWalletService.h" #include "nsPrompt.h" diff --git a/mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp b/mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp index d522e6d30c4..60e3eafd75b 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp @@ -592,9 +592,8 @@ nsPromptService::GetLocaleString(const char *aKey, PRUnichar **aResult) nsCOMPtr stringService = do_GetService(kStringBundleServiceCID); nsCOMPtr stringBundle; - nsILocale *locale = nsnull; - rv = stringService->CreateBundle(kCommonDialogsProperties, locale, getter_AddRefs(stringBundle)); + rv = stringService->CreateBundle(kCommonDialogsProperties, getter_AddRefs(stringBundle)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).GetUnicode(), aResult); diff --git a/mozilla/extensions/cookie/nsUtils.cpp b/mozilla/extensions/cookie/nsUtils.cpp index c6cc137004e..c38c2c9e371 100644 --- a/mozilla/extensions/cookie/nsUtils.cpp +++ b/mozilla/extensions/cookie/nsUtils.cpp @@ -268,9 +268,8 @@ CKutil_Localize(const PRUnichar *genericString) { PRUnichar *ptrv = nsnull; NS_WITH_SERVICE(nsIStringBundleService, pStringService, kStringBundleServiceCID, &ret); if (NS_SUCCEEDED(ret) && (nsnull != pStringService)) { - nsCOMPtr locale; nsCOMPtr bundle; - ret = pStringService->CreateBundle(LOCALIZATION, locale, getter_AddRefs(bundle)); + ret = pStringService->CreateBundle(LOCALIZATION, getter_AddRefs(bundle)); if (NS_SUCCEEDED(ret) && bundle) { ret = bundle->GetStringFromName(genericString, &ptrv); if ( NS_SUCCEEDED(ret) && (ptrv) ) { diff --git a/mozilla/extensions/cookie/tests/TestCookie.cpp b/mozilla/extensions/cookie/tests/TestCookie.cpp index 82a62f17513..cd5cd5f26ab 100644 --- a/mozilla/extensions/cookie/tests/TestCookie.cpp +++ b/mozilla/extensions/cookie/tests/TestCookie.cpp @@ -90,9 +90,7 @@ int main(PRInt32 argc, char *argv[]) { nsCOMPtr stringBundle; char* propertyURL = "chrome://necko/locale/necko.properties"; - nsILocale *locale = nsnull; - rv = bundleService->CreateBundle(propertyURL, locale, - getter_AddRefs(stringBundle)); + rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); diff --git a/mozilla/extensions/p3p/src/nsP3PService.cpp b/mozilla/extensions/p3p/src/nsP3PService.cpp index da2cdc74c5c..4cd39fc97b3 100644 --- a/mozilla/extensions/p3p/src/nsP3PService.cpp +++ b/mozilla/extensions/p3p/src/nsP3PService.cpp @@ -346,7 +346,6 @@ nsP3PService::Init( ) { ("P3PService: Creating string bundle.\n") ); rv = pStringBundleService->CreateBundle((const char *)xcsSpec, - nsnull, getter_AddRefs( mStringBundle ) ); } } diff --git a/mozilla/extensions/psm-glue/src/nsFSDR.cpp b/mozilla/extensions/psm-glue/src/nsFSDR.cpp index abe816c4eb9..3ad65b2d84d 100644 --- a/mozilla/extensions/psm-glue/src/nsFSDR.cpp +++ b/mozilla/extensions/psm-glue/src/nsFSDR.cpp @@ -105,7 +105,6 @@ Wallet_Localize(char* genericString) { NS_RELEASE(url); return v.ToNewUnicode(); } - nsILocale* locale = nsnull; nsIStringBundle* bundle = nsnull; char* spec = nsnull; ret = url->GetSpec(&spec); @@ -116,7 +115,7 @@ Wallet_Localize(char* genericString) { nsCRT::free(spec); return v.ToNewUnicode(); } - ret = pStringService->CreateBundle(spec, locale, &bundle); + ret = pStringService->CreateBundle(spec, &bundle); nsCRT::free(spec); if (NS_FAILED(ret)) { printf("cannot create instance\n"); diff --git a/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp b/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp index f4d5f5be0c7..bf865b7c8ca 100644 --- a/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp +++ b/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp @@ -167,8 +167,7 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindowInternal *window, nsIDOMElement *button) NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv); if (NS_FAILED(rv)) return rv; - nsILocale* locale = nsnull; - rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(mStringBundle)); + rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, getter_AddRefs(mStringBundle)); if (NS_FAILED(rv)) return rv; // hook up to the form post notifications: diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index e998ecb359d..7b5a05ce9e1 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -49,7 +49,6 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsIStringBundle.h" -#include "nsILocale.h" #include "nsIFileSpec.h" #include "prmem.h" #include "prprf.h" @@ -463,9 +462,8 @@ Wallet_Localize(char* genericString) { #endif return v.ToNewUnicode(); } - nsCOMPtr locale; nsCOMPtr bundle; - ret = pStringService->CreateBundle(PROPERTIES_URL, locale, getter_AddRefs(bundle)); + ret = pStringService->CreateBundle(PROPERTIES_URL, getter_AddRefs(bundle)); if (NS_FAILED(ret)) { #ifdef DEBUG printf("cannot create instance\n"); diff --git a/mozilla/intl/strres/public/nsIStringBundle.idl b/mozilla/intl/strres/public/nsIStringBundle.idl index bc063d9ba71..2c5eeadad89 100644 --- a/mozilla/intl/strres/public/nsIStringBundle.idl +++ b/mozilla/intl/strres/public/nsIStringBundle.idl @@ -22,12 +22,9 @@ #include "nsISupports.idl" #include "nsIEnumerator.idl" -#include "nsILocale.idl" %{C++ -#include "nsILocale.h" - // Define Contractid and CID // {D85A17C1-AA7C-11d2-9B8C-00805F8A16D9} #define NS_STRINGBUNDLESERVICE_CID \ @@ -94,10 +91,8 @@ interface nsIStringBundle : nsISupports [scriptable, uuid(D85A17C0-AA7C-11d2-9B8C-00805F8A16D9)] interface nsIStringBundleService : nsISupports { - nsIStringBundle CreateBundle([const] in string aURLSpec, - in nsILocale aLocale); + nsIStringBundle CreateBundle([const] in string aURLSpec); nsIStringBundle CreateAsyncBundle([const] in string aURLSpec); - nsIStringBundle CreateExtensibleBundle([const] in string aRegistryKey); /** diff --git a/mozilla/intl/strres/src/nsAcceptLang.cpp b/mozilla/intl/strres/src/nsAcceptLang.cpp index 7040c85b402..4b573c67c6c 100644 --- a/mozilla/intl/strres/src/nsAcceptLang.cpp +++ b/mozilla/intl/strres/src/nsAcceptLang.cpp @@ -27,7 +27,6 @@ #include "nsIServiceManager.h" #include "nsID.h" #include "nsString.h" -#include "nsILocale.h" #include "nsIStringBundle.h" #include "nsAcceptLang.h" @@ -87,10 +86,10 @@ nsAcceptLang::GetAcceptLangFromLocale(const PRUnichar *aLocale, PRUnichar **_ret nsIStringBundle *bundle = nsnull; #if 1 res = sBundleService->CreateBundle("resource:/res/language.properties", - nsnull, &bundle); + &bundle); #else res = sBundleService->CreateBundle("chrome://global/locale/languageNames.properties", - nsnull, &bundle); + &bundle); #endif PRUnichar *ptrv = nsnull; nsString lc_tmp(aLocale); @@ -182,7 +181,7 @@ nsAcceptLang::GetLocaleFromAcceptLang(const PRUnichar *aName, PRUnichar **_retva nsIStringBundle *bundle = nsnull; /* shall we put the file in res/ instead ? */ res = sBundleService->CreateBundle("chrome://global/locale/accept2locale.properties", - nsnull, &bundle); + &bundle); PRUnichar *ptrv = nsnull; if (NS_OK == (res = bundle->GetStringFromName(acceptLang.GetUnicode(), &ptrv))) { diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index c59b3a9390f..49d7e9fb9d3 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -606,7 +606,7 @@ nsExtensibleStringBundle::Init(const char * aRegistryKey) res = registry->GetStringUTF8(key, "name", getter_Copies(name)); if (NS_FAILED(res)) return res; - res = sbServ->CreateBundle(name, nsnull, getter_AddRefs(bundle)); + res = sbServ->CreateBundle(name, getter_AddRefs(bundle)); if (NS_FAILED(res)) { res = components->Next(); if (NS_FAILED(res)) return res; @@ -956,8 +956,7 @@ nsStringBundleService::recycleEntry(bundleCacheEntry_t *aEntry) } NS_IMETHODIMP -nsStringBundleService::CreateBundle(const char* aURLSpec, nsILocale* aLocale, - nsIStringBundle** aResult) +nsStringBundleService::CreateBundle(const char* aURLSpec, nsIStringBundle** aResult) { #ifdef DEBUG_tao_ printf("\n++ nsStringBundleService::CreateBundle ++\n"); diff --git a/mozilla/intl/strres/tests/StringBundleTest.cpp b/mozilla/intl/strres/tests/StringBundleTest.cpp index e5063754989..05dc4757ed0 100644 --- a/mozilla/intl/strres/tests/StringBundleTest.cpp +++ b/mozilla/intl/strres/tests/StringBundleTest.cpp @@ -27,7 +27,6 @@ #include "nsIStringBundle.h" #include "nsIAcceptLang.h" #include "nsIEventQueueService.h" -#include "nsILocale.h" #include #include "nsIIOService.h" @@ -78,54 +77,9 @@ static NS_DEFINE_IID(kIAcceptLangIID, NS_IACCEPTLANG_IID); // //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// -#include "nsILocale.h" #include "nsILocaleService.h" #include "nsLocaleCID.h" -// -// -// -nsILocale* -get_applocale(void) -{ - nsresult result; - nsILocale* locale; - nsString* category; - nsString* value; - PRUnichar *lc_name_unichar; - - // get a locale service - nsCOMPtr localeService = do_GetService(NS_LOCALESERVICE_CONTRACTID, &result); - NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: get locale service failed"); - - // - // test GetApplicationLocale - // - result = localeService->GetApplicationLocale(&locale); - NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: factory_get_locale failed"); - NS_ASSERTION(locale!=NULL,"nsLocaleTest: factory_get_locale failed"); - - // - // test and make sure the locale is a valid Interface - // - locale->AddRef(); - - category = new nsString(); - category->AssignWithConversion("NSILOCALE_MESSAGES"); - value = new nsString(); - - result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar); - value->Assign(lc_name_unichar); - NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: factory_get_locale failed"); - NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed"); - - locale->Release(); - delete category; - delete value; - - return locale; -} - //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -189,15 +143,9 @@ main(int argc, char *argv[]) } printf("\n ** created AcceptLang service\n"); - nsILocale* locale = get_applocale(); - nsIStringBundle* bundle = nsnull; - ret = service->CreateBundle(TEST_URL, locale, &bundle); - - /* free it - */ - locale->Release(); + ret = service->CreateBundle(TEST_URL, &bundle); if (NS_FAILED(ret)) { printf("cannot create instance\n"); diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index bdd7f724b26..9fe80bec0c5 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -895,8 +895,7 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); if (NS_SUCCEEDED(rv) && spec) { - nsCOMPtr locale = nsnull; - rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle)); + rv = stringService->CreateBundle(spec, getter_AddRefs(bundle)); } } } diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index bdd7f724b26..9fe80bec0c5 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -895,8 +895,7 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); if (NS_SUCCEEDED(rv) && spec) { - nsCOMPtr locale = nsnull; - rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle)); + rv = stringService->CreateBundle(spec, getter_AddRefs(bundle)); } } } diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 983a9e0e16a..7435b88a556 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -1280,7 +1280,6 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString) if (NS_SUCCEEDED(rv) && bundleService) { nsCOMPtr bundle; rv = bundleService->CreateBundle("chrome://global/locale/keys.properties", - nsnull, getter_AddRefs(bundle)); if (NS_SUCCEEDED(rv) && bundle) { diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp index 8c41a8d0c32..b4bfe5496d8 100644 --- a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp +++ b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp @@ -232,8 +232,7 @@ nsAbSyncDriver::GetString(const PRUnichar *aStringName) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); } } diff --git a/mozilla/mailnews/absync/src/nsAbSync.cpp b/mozilla/mailnews/absync/src/nsAbSync.cpp index da25136b492..2b1b6c09b14 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.cpp +++ b/mozilla/mailnews/absync/src/nsAbSync.cpp @@ -2998,8 +2998,7 @@ nsAbSync::GetString(const PRUnichar *aStringName) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); } } diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 702a6665b09..2bcdd81ffcd 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -1737,8 +1737,7 @@ nsMessenger::InitStringBundle() kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - res = sBundleService->CreateBundle(propertyURL, locale, + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); } } diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp index ca820f12935..d9dbb624c73 100644 --- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp @@ -409,7 +409,6 @@ nsMessengerMigrator::initializeStrings() nsCOMPtr bundle; rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties", - nsnull, getter_AddRefs(bundle)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp index 2e7c35df4f2..a2c4ac3f35b 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp @@ -898,7 +898,6 @@ nsMsgAccountManagerDataSource::getStringBundle() if (NS_FAILED(rv)) return rv; rv = strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties", - nsnull, // default locale getter_AddRefs(mStringBundle)); return rv; } diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp index e78d736a9e7..63facbf973d 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -182,7 +182,7 @@ PRUnichar * nsMsgDBView::GetString(const PRUnichar *aStringName) char *propertyURL = MESSENGER_STRING_URL; nsCOMPtr sBundleService = do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && sBundleService) - res = sBundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(mMessengerStringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mMessengerStringBundle)); } if (mMessengerStringBundle) diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp index 711112a4584..32a5dde41b3 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -227,8 +227,7 @@ nsresult nsFolderCompactState::GetStatusFromMsgName(const char *statusMsgName, P kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - res = sBundleService->CreateBundle(propertyURL, nsnull, - getter_AddRefs(stringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } if (stringBundle) { diff --git a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp index d7ccf79c049..36463ccdda5 100644 --- a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp @@ -265,8 +265,7 @@ nsresult nsMsgOfflineManager::ShowStatus(const char *statusMsgName) kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - res = sBundleService->CreateBundle(propertyURL, nsnull, - getter_AddRefs(mStringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); } } if (mStringBundle) diff --git a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp index 01be4aae795..f742cad7d91 100644 --- a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp @@ -399,8 +399,7 @@ nsMsgPrintEngine::GetString(const PRUnichar *aStringName) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); } } diff --git a/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp b/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp index 177609aed77..84674c7fb83 100644 --- a/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp +++ b/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp @@ -58,7 +58,6 @@ nsMsgStatusFeedback::nsMsgStatusFeedback() : if (NS_SUCCEEDED(rv)) bundleService->CreateBundle("chrome://messenger/locale/messenger.properties", - nsnull, getter_AddRefs(mBundle)); } } diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index edaafd30adb..90c2038073c 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -188,7 +188,6 @@ nsMsgFolder::initializeStrings() nsCOMPtr bundle; rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties", - nsnull, getter_AddRefs(bundle)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index 16f960267f1..e6846f65609 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -1276,8 +1276,7 @@ NS_IMETHODIMP nsMsgIncomingServer::DisplayOfflineMsg(nsIMsgWindow *aMsgWindow) NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr bundle; - rv = bundleService->CreateBundle(BASE_MSGS_URL, nsnull, - getter_AddRefs(bundle)); + rv = bundleService->CreateBundle(BASE_MSGS_URL, getter_AddRefs(bundle)); NS_ENSURE_SUCCESS(rv, rv); if (bundle) { diff --git a/mozilla/mailnews/compose/src/nsMsgComposeStringBundle.cpp b/mozilla/mailnews/compose/src/nsMsgComposeStringBundle.cpp index 3202757b6af..20df684a932 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeStringBundle.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeStringBundle.cpp @@ -86,7 +86,7 @@ nsComposeStringService::InitializeStringBundle() nsCOMPtr stringService = do_GetService(kStringBundleServiceCID); NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(stringService->CreateBundle(COMPOSE_BE_URL, nsnull, getter_AddRefs(mComposeStringBundle)), + NS_ENSURE_SUCCESS(stringService->CreateBundle(COMPOSE_BE_URL, getter_AddRefs(mComposeStringBundle)), NS_ERROR_FAILURE); return NS_OK; } diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index c2dde696e41..f5893240e81 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -1793,9 +1793,7 @@ nsresult nsImapIncomingServer::GetStringBundle() NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - - res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(m_stringBundle)); + res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle)); } } return (m_stringBundle) ? NS_OK : res; diff --git a/mozilla/mailnews/imap/src/nsImapStringBundle.cpp b/mozilla/mailnews/imap/src/nsImapStringBundle.cpp index 3d8fb2158b4..e044bfb0ede 100644 --- a/mozilla/mailnews/imap/src/nsImapStringBundle.cpp +++ b/mozilla/mailnews/imap/src/nsImapStringBundle.cpp @@ -46,10 +46,8 @@ IMAPGetStringByID(PRInt32 stringID) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { - nsILocale *locale = nsnull; - nsIStringBundle* sBundle = nsnull; - res = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + res = sBundleService->CreateBundle(propertyURL, &sBundle); if (NS_SUCCEEDED(res)) { diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp index 282f90f72f5..23554e8609f 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp @@ -45,8 +45,7 @@ nsIStringBundle *nsEudoraStringBundle::GetStringBundle( void) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { - nsILocale * locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + rv = sBundleService->CreateBundle(propertyURL, &sBundle); } m_pBundle = sBundle; diff --git a/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp b/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp index c878a4d8649..4d52c6e5d8e 100644 --- a/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp @@ -48,8 +48,7 @@ nsIStringBundle *nsOEStringBundle::GetStringBundle( void) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { - nsILocale * locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + rv = sBundleService->CreateBundle(propertyURL, &sBundle); } m_pBundle = sBundle; diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp index 39cab858110..ef4439aca07 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp @@ -48,8 +48,7 @@ nsIStringBundle *nsOutlookStringBundle::GetStringBundle( void) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { - nsILocale * locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + rv = sBundleService->CreateBundle(propertyURL, &sBundle); } m_pBundle = sBundle; diff --git a/mozilla/mailnews/import/src/nsImportStringBundle.cpp b/mozilla/mailnews/import/src/nsImportStringBundle.cpp index 9a7276283b2..fda810a0ad0 100644 --- a/mozilla/mailnews/import/src/nsImportStringBundle.cpp +++ b/mozilla/mailnews/import/src/nsImportStringBundle.cpp @@ -48,8 +48,7 @@ nsIStringBundle *nsImportStringBundle::GetStringBundle( void) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { - nsILocale * locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + rv = sBundleService->CreateBundle(propertyURL, &sBundle); } m_pBundle = sBundle; diff --git a/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp b/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp index 657c135fbba..e24f720872e 100644 --- a/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp +++ b/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp @@ -45,8 +45,7 @@ nsIStringBundle *nsTextStringBundle::GetStringBundle( void) NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { - nsILocale * locale = nsnull; - rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle); + rv = sBundleService->CreateBundle(propertyURL, &sBundle); } m_pBundle = sBundle; diff --git a/mozilla/mailnews/local/src/nsLocalStringBundle.cpp b/mozilla/mailnews/local/src/nsLocalStringBundle.cpp index 019ad8ac141..04085bfeb03 100644 --- a/mozilla/mailnews/local/src/nsLocalStringBundle.cpp +++ b/mozilla/mailnews/local/src/nsLocalStringBundle.cpp @@ -85,7 +85,7 @@ nsLocalStringService::InitializeStringBundle() NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE); - rv = stringService->CreateBundle(LOCAL_MSGS_URL, nsnull, getter_AddRefs(mLocalStringBundle)); + rv = stringService->CreateBundle(LOCAL_MSGS_URL, getter_AddRefs(mLocalStringBundle)); return rv; } diff --git a/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp b/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp index 29321887173..d0e3af056b0 100644 --- a/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp +++ b/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp @@ -102,7 +102,6 @@ nsPop3IncomingServer::initializeStrings() nsCOMPtr bundle; rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties", - nsnull, getter_AddRefs(bundle)); NS_ENSURE_SUCCESS(rv, rv);