mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
valeski%netscape.com 2001-04-27 21:30:24 +00:00
Родитель f61c7293f4
Коммит 00bca056ef
71 изменённых файлов: 80 добавлений и 305 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
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)) {

3
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<nsILocale> 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;

11
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -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);

3
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.

3
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.

3
embedding/base/nsEmbedAPI.cpp
Просмотреть файл

@ -141,8 +141,7 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
{
nsCOMPtr<nsIStringBundle> stringBundle;
char* propertyURL = "chrome://necko/locale/necko.properties";
nsILocale *locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale,
rv = sBundleService->CreateBundle(propertyURL,
getter_AddRefs(stringBundle));
}
#endif

2
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" );

1
embedding/components/windowwatcher/src/nsPrompt.cpp
Просмотреть файл

@ -20,7 +20,6 @@
* Contributor(s):
*/
#include "nsILocale.h"
#include "nsIServiceManager.h"
#include "nsIWalletService.h"
#include "nsPrompt.h"

3
embedding/components/windowwatcher/src/nsPromptService.cpp
Просмотреть файл

@ -592,9 +592,8 @@ nsPromptService::GetLocaleString(const char *aKey, PRUnichar **aResult)
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
nsCOMPtr<nsIStringBundle> 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);

3
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<nsILocale> locale;
nsCOMPtr<nsIStringBundle> 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) ) {

4
extensions/cookie/tests/TestCookie.cpp
Просмотреть файл

@ -90,9 +90,7 @@ int main(PRInt32 argc, char *argv[])
{
nsCOMPtr<nsIStringBundle> 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);

1
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 ) );
}
}

3
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");

3
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:

4
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<nsILocale> locale;
nsCOMPtr<nsIStringBundle> 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");

7
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);
/**

7
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))) {

5
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");

54
intl/strres/tests/StringBundleTest.cpp
Просмотреть файл

@ -27,7 +27,6 @@
#include "nsIStringBundle.h"
#include "nsIAcceptLang.h"
#include "nsIEventQueueService.h"
#include "nsILocale.h"
#include <iostream.h>
#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<nsILocaleService> 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");

3
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<nsILocale> locale = nsnull;
rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = stringService->CreateBundle(spec, getter_AddRefs(bundle));
}
}
}

3
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<nsILocale> locale = nsnull;
rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = stringService->CreateBundle(spec, getter_AddRefs(bundle));
}
}
}

1
layout/xul/base/src/nsMenuFrame.cpp
Просмотреть файл

@ -1280,7 +1280,6 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString)
if (NS_SUCCEEDED(rv) && bundleService) {
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://global/locale/keys.properties",
nsnull,
getter_AddRefs(bundle));
if (NS_SUCCEEDED(rv) && bundle) {

3
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));
}
}

3
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));
}
}

3
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));
}
}

1
mailnews/base/src/nsMessengerMigrator.cpp
Просмотреть файл

@ -409,7 +409,6 @@ nsMessengerMigrator::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

1
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;
}

2
mailnews/base/src/nsMsgDBView.cpp
Просмотреть файл

@ -182,7 +182,7 @@ PRUnichar * nsMsgDBView::GetString(const PRUnichar *aStringName)
char *propertyURL = MESSENGER_STRING_URL;
nsCOMPtr<nsIStringBundleService> 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)

3
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)
{

3
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)

3
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));
}
}

1
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));
}
}

1
mailnews/base/util/nsMsgFolder.cpp
Просмотреть файл

@ -188,7 +188,6 @@ nsMsgFolder::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

3
mailnews/base/util/nsMsgIncomingServer.cpp
Просмотреть файл

@ -1276,8 +1276,7 @@ NS_IMETHODIMP nsMsgIncomingServer::DisplayOfflineMsg(nsIMsgWindow *aMsgWindow)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> 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)
{

2
mailnews/compose/src/nsMsgComposeStringBundle.cpp
Просмотреть файл

@ -86,7 +86,7 @@ nsComposeStringService::InitializeStringBundle()
nsCOMPtr<nsIStringBundleService> 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;
}

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

4
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))
{

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

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

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

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

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

2
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;
}

1
mailnews/local/src/nsPop3IncomingServer.cpp
Просмотреть файл

@ -102,7 +102,6 @@ nsPop3IncomingServer::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

2
mailnews/mime/cthandlers/signstub/nsSignedStub.cpp
Просмотреть файл

@ -215,7 +215,7 @@ nsCOMPtr<nsIStringBundle> stringBundle = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(stringBundle));
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
}
}

4
mailnews/mime/cthandlers/vcard/mimevcrd.cpp
Просмотреть файл

@ -1867,9 +1867,7 @@ nsCOMPtr<nsIStringBundle> stringBundle = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(stringBundle));
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
}
}

4
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
Просмотреть файл

@ -192,9 +192,7 @@ nsMimeBaseEmitter::MimeGetStringByName(const char *aHeaderName)
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));
}
}

4
mailnews/mime/src/mimemoz2.cpp
Просмотреть файл

@ -1814,9 +1814,7 @@ MimeGetStringByID(PRInt32 stringID)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(stringBundle));
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
}
}

6
mailnews/news/src/nsNNTPNewsgroupList.cpp
Просмотреть файл

@ -268,7 +268,7 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(nsIMsgWindow *aMsgWindow,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
rv = bundle->GetStringFromName(NS_LITERAL_STRING("noNewMessages").get(), getter_Copies(statusString));
@ -704,7 +704,7 @@ nsNNTPNewsgroupList::ProcessXOVERLINE(const char *line, PRUint32 *status)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
const PRUnichar *formatStrings[2] = { numDownloadedStr.GetUnicode(), totalToDownloadStr.GetUnicode() };
@ -798,7 +798,7 @@ nsNNTPNewsgroupList::FinishXOVERLINE(int status, int *newstatus)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
const PRUnichar *formatStrings[2] = { firstStr.GetUnicode(), lastStr.GetUnicode() };

9
mailnews/news/src/nsNNTPProtocol.cpp
Просмотреть файл

@ -3163,8 +3163,7 @@ PRInt32 nsNNTPProtocol::ReadNewsList(nsIInputStream * inputStream, PRUint32 leng
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull,
getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString bytesStr;
@ -3625,7 +3624,7 @@ nsresult nsNNTPProtocol::GetNewsStringByID(PRInt32 stringID, PRUnichar **aString
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = bundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(m_stringBundle));
rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle));
NS_ENSURE_SUCCESS(rv, rv);
}
@ -3661,7 +3660,7 @@ nsresult nsNNTPProtocol::GetNewsStringByName(const char *aName, PRUnichar **aStr
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = bundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(m_stringBundle));
rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle));
}
if (m_stringBundle)
@ -3858,7 +3857,7 @@ nsNNTPProtocol::SetCheckingForNewNewsStatus(PRInt32 current, PRInt32 total)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString thisGroupStr; thisGroupStr.AppendInt(current);

2
mailnews/news/src/nsNewsDownloader.cpp
Просмотреть файл

@ -192,7 +192,7 @@ PRBool nsNewsDownloader::GetNextHdrToRetrieve()
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString firstStr;

2
mailnews/news/src/nsNewsFolder.cpp
Просмотреть файл

@ -949,7 +949,7 @@ nsMsgNewsFolder::DeleteMessages(nsISupportsArray *messages, nsIMsgWindow *aMsgWi
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLString alertText;

2
modules/libpref/src/nsPrefBranch.cpp
Просмотреть файл

@ -623,7 +623,7 @@ nsresult nsPrefBranch::GetDefaultFromPropertiesFile(const char *aPrefName, PRUni
return rv;
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(propertyFileURL, nsnull,
rv = bundleService->CreateBundle(propertyFileURL,
getter_AddRefs(bundle));
if (NS_FAILED(rv))
return rv;

9
modules/plugin/base/src/nsPluginHostImpl.cpp
Просмотреть файл

@ -68,7 +68,6 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -215,7 +214,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
if (!prefs || !prompt || !io || !strings) {
@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -4478,7 +4476,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4494,7 +4491,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
nsCRT::free(spec);
if (NS_FAILED(rv))
return rv;

9
modules/plugin/nglsrc/nsPluginHostImpl.cpp
Просмотреть файл

@ -68,7 +68,6 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -215,7 +214,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
if (!prefs || !prompt || !io || !strings) {
@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -4478,7 +4476,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4494,7 +4491,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
nsCRT::free(spec);
if (NS_FAILED(rv))
return rv;

3
netwerk/base/src/nsSocketTransportService.cpp
Просмотреть файл

@ -696,8 +696,7 @@ nsSocketTransportService::GetNeckoStringByName (const char *aName, PRUnichar **a
NS_WITH_PROXIED_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID,
NS_UI_THREAD_EVENTQ, &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));
}
}

2
profile/pref-migrator/src/nsPrefMigration.cpp
Просмотреть файл

@ -2056,7 +2056,7 @@ nsPrefMigration::DetermineOldPath(nsIFileSpec *profilePath, const char *oldPathN
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) return rv;
nsXPIDLString localizedDirName;

3
webshell/tests/viewer/nsBrowserWindow.cpp
Просмотреть файл

@ -1298,9 +1298,8 @@ GetTitleSuffix(void)
NS_RELEASE(service);
return suffix;
}
nsILocale* locale = nsnull;
nsIStringBundle* bundle = nsnull;
ret = service->CreateBundle(url, locale, &bundle);
ret = service->CreateBundle(url, &bundle);
NS_RELEASE(url);
if (NS_FAILED(ret)) {
NS_RELEASE(service);

3
widget/src/xpwidgets/nsBaseFilePicker.cpp
Просмотреть файл

@ -119,9 +119,8 @@ nsBaseFilePicker::AppendFilters(PRInt32 aFilterMask)
nsresult rv;
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
nsCOMPtr<nsIStringBundle> stringBundle;
nsILocale *locale = nsnull;
rv = stringService->CreateBundle(FILEPICKER_PROPERTIES, locale, getter_AddRefs(stringBundle));
rv = stringService->CreateBundle(FILEPICKER_PROPERTIES, getter_AddRefs(stringBundle));
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;

3
xpfe/components/bookmarks/src/nsBookmarksService.cpp
Просмотреть файл

@ -1634,9 +1634,8 @@ nsBookmarksService::Init()
char *spec = nsnull;
if (NS_SUCCEEDED(rv = uri->GetSpec(&spec)) && (spec))
{
nsCOMPtr<nsILocale> locale = nsnull;
if (NS_SUCCEEDED(rv = stringService->CreateBundle(spec,
locale, getter_AddRefs(mBundle))))
getter_AddRefs(mBundle))))
{
}
nsCRT::free(spec);

33
xpfe/components/filepicker/src/nsFilePicker.js
Просмотреть файл

@ -41,7 +41,6 @@ const FILEPICKER_CONTRACTID = "@mozilla.org/filepicker;1";
const FILEPICKER_CID = Components.ID("{54ae32f8-1dd2-11b2-a209-df7c505370f8}");
const LOCAL_FILE_CONTRACTID = "@mozilla.org/file/local;1";
const APPSHELL_SERV_CONTRACTID = "@mozilla.org/appshell/appShellService;1";
const LOCALE_SERV_CONTRACTID = "@mozilla.org/intl/nslocaleservice;1";
const STRBUNDLE_SERV_CONTRACTID = "@mozilla.org/intl/stringbundle;1";
const nsIAppShellService = Components.interfaces.nsIAppShellService;
@ -52,7 +51,6 @@ const nsIFactory = Components.interfaces.nsIFactory;
const nsIFilePicker = Components.interfaces.nsIFilePicker;
const nsIInterfaceRequestor = Components.interfaces.nsIInterfaceRequestor
const nsIDOMWindow = Components.interfaces.nsIDOMWindow;
const nsILocaleService = Components.interfaces.nsILocaleService;
const nsIStringBundleService = Components.interfaces.nsIStringBundleService;
var bundle = null;
@ -247,29 +245,8 @@ function NSGetModule(compMgr, fileSpec) {
/* crap from strres.js that I want to use for string bundles since I can't include another .js file.... */
var strBundleService = null;
var localeService = null;
function srGetAppLocale()
{
var applicationLocale = null;
if (!localeService) {
try {
localeService = Components.classes[LOCALE_SERV_CONTRACTID].getService(nsILocaleService);
} catch (ex) {
dump("\n--** localeService failed: " + ex + "\n");
return null;
}
}
applicationLocale = localeService.GetApplicationLocale();
if (!applicationLocale) {
dump("\n--** localeService.GetApplicationLocale failed **--\n");
}
return applicationLocale;
}
function srGetStrBundleWithLocale(path, locale)
function srGetStrBundle(path)
{
var strBundle = null;
@ -282,16 +259,10 @@ function srGetStrBundleWithLocale(path, locale)
}
}
strBundle = strBundleService.CreateBundle(path, locale);
strBundle = strBundleService.CreateBundle(path);
if (!strBundle) {
dump("\n--** strBundle createInstance failed **--\n");
}
return strBundle;
}
function srGetStrBundle(path)
{
var appLocale = srGetAppLocale();
return srGetStrBundleWithLocale(path, appLocale);
}

33
xpfe/components/filepicker/src/nsFilePicker.js.in
Просмотреть файл

@ -41,7 +41,6 @@ const FILEPICKER_CONTRACTID = "@mozilla.org/filepicker;1";
const FILEPICKER_CID = Components.ID("{54ae32f8-1dd2-11b2-a209-df7c505370f8}");
const LOCAL_FILE_CONTRACTID = "@mozilla.org/file/local;1";
const APPSHELL_SERV_CONTRACTID = "@mozilla.org/appshell/appShellService;1";
const LOCALE_SERV_CONTRACTID = "@mozilla.org/intl/nslocaleservice;1";
const STRBUNDLE_SERV_CONTRACTID = "@mozilla.org/intl/stringbundle;1";
const nsIAppShellService = Components.interfaces.nsIAppShellService;
@ -52,7 +51,6 @@ const nsIFactory = Components.interfaces.nsIFactory;
const nsIFilePicker = Components.interfaces.nsIFilePicker;
const nsIInterfaceRequestor = Components.interfaces.nsIInterfaceRequestor
const nsIDOMWindow = Components.interfaces.nsIDOMWindow;
const nsILocaleService = Components.interfaces.nsILocaleService;
const nsIStringBundleService = Components.interfaces.nsIStringBundleService;
var bundle = null;
@ -247,29 +245,8 @@ function NSGetModule(compMgr, fileSpec) {
/* crap from strres.js that I want to use for string bundles since I can't include another .js file.... */
var strBundleService = null;
var localeService = null;
function srGetAppLocale()
{
var applicationLocale = null;
if (!localeService) {
try {
localeService = Components.classes[LOCALE_SERV_CONTRACTID].getService(nsILocaleService);
} catch (ex) {
dump("\n--** localeService failed: " + ex + "\n");
return null;
}
}
applicationLocale = localeService.GetApplicationLocale();
if (!applicationLocale) {
dump("\n--** localeService.GetApplicationLocale failed **--\n");
}
return applicationLocale;
}
function srGetStrBundleWithLocale(path, locale)
function srGetStrBundle(path)
{
var strBundle = null;
@ -282,16 +259,10 @@ function srGetStrBundleWithLocale(path, locale)
}
}
strBundle = strBundleService.CreateBundle(path, locale);
strBundle = strBundleService.CreateBundle(path);
if (!strBundle) {
dump("\n--** strBundle createInstance failed **--\n");
}
return strBundle;
}
function srGetStrBundle(path)
{
var appLocale = srGetAppLocale();
return srGetStrBundleWithLocale(path, appLocale);
}

2
xpfe/components/history/src/nsGlobalHistory.cpp
Просмотреть файл

@ -2075,7 +2075,7 @@ nsGlobalHistory::Init()
do_GetService(kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = bundleService->CreateBundle("chrome://communicator/locale/history/history.properties", nsnull, getter_AddRefs(mBundle));
rv = bundleService->CreateBundle("chrome://communicator/locale/history/history.properties", getter_AddRefs(mBundle));
}
// register to observe profile changes

2
xpfe/components/search/src/nsInternetSearchService.cpp
Просмотреть файл

@ -1058,7 +1058,7 @@ InternetSearchDataSource::GetTarget(nsIRDFResource *source,
if (NS_SUCCEEDED(rv) && stringService) {
nsCOMPtr<nsIStringBundle> bundle;
rv = stringService->CreateBundle(SEARCH_PROPERTIES, nsnull, getter_AddRefs(bundle));
rv = stringService->CreateBundle(SEARCH_PROPERTIES, getter_AddRefs(bundle));
if (NS_SUCCEEDED(rv) && bundle) {
nsXPIDLString valUni;

8
xpfe/components/sidebar/src/nsSidebar.js
Просмотреть файл

@ -425,13 +425,7 @@ function getStringBundle(aURL)
{
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService();
stringBundleService = stringBundleService.QueryInterface(Components.interfaces.nsIStringBundleService);
var appLocale;
var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"].getService();
if (localeService)
localeService = localeService.QueryInterface(Components.interfaces.nsILocaleService);
if (localeService)
appLocale = localeService.GetApplicationLocale();
var stringBundle = stringBundleService.CreateBundle(aURL, appLocale);
var stringBundle = stringBundleService.createBundle(aURL);
if (stringBundle)
return stringBundle.QueryInterface(Components.interfaces.nsIStringBundle);
}

2
xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp
Просмотреть файл

@ -258,7 +258,7 @@ nsUnknownContentTypeHandler::PromptForSaveToFile(nsISupports * aWindowContext, c
nsCOMPtr<nsIStringBundle> stringBundle;
NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(stringService->CreateBundle(HELPERAPP_DIALOG_URL, nsnull, getter_AddRefs(stringBundle)),
NS_ENSURE_SUCCESS(stringService->CreateBundle(HELPERAPP_DIALOG_URL, getter_AddRefs(stringBundle)),
NS_ERROR_FAILURE);
nsXPIDLString windowTitle;

2
xpfe/components/winhooks/nsWindowsHooks.cpp
Просмотреть файл

@ -279,10 +279,8 @@ nsWindowsHooks::CheckSettings( nsIDOMWindowInternal *aParent ) {
if ( promptService && bundleService ) {
// Next, get bundle that provides text for dialog.
nsILocale *locale = 0;
nsIStringBundle *bundle;
rv = bundleService->CreateBundle( "chrome://global/locale/nsWindowsHooks.properties",
locale,
getter_AddRefs( &bundle ) );
if ( NS_SUCCEEDED( rv ) && bundle ) {
// Get text for dialog and checkbox label.

2
xpfe/components/xfer/src/nsStreamTransfer.cpp
Просмотреть файл

@ -239,11 +239,9 @@ nsStreamTransfer::SelectFile( nsIDOMWindowInternal *parent, nsILocalFile **aResu
nsCID cid = NS_STRINGBUNDLESERVICE_CID;
NS_WITH_SERVICE( nsIStringBundleService, bundleService, cid, &rv );
if ( NS_SUCCEEDED( rv ) ) {
nsILocale *locale = 0;
nsIStringBundle *bundle;
PRUnichar *pString;
rv = bundleService->CreateBundle( "chrome://global/locale/downloadProgress.properties",
locale,
getter_AddRefs( &bundle ) );
if ( NS_SUCCEEDED( rv ) ) {
rv = bundle->GetStringFromName( NS_ConvertASCIItoUCS2( "FilePickerTitle" ).GetUnicode(),

33
xpfe/global/resources/content/strres.js
Просмотреть файл

@ -1,29 +1,6 @@
var strBundleService = null;
var localeService = null;
function srGetAppLocale()
{
var applicationLocale = null;
if (!localeService) {
try {
localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"].getService();
localeService = localeService.QueryInterface(Components.interfaces.nsILocaleService);
} catch (ex) {
dump("\n--** localeService failed: " + ex + "\n");
return null;
}
}
applicationLocale = localeService.GetApplicationLocale();
if (!applicationLocale) {
dump("\n--** localeService.GetApplicationLocale failed **--\n");
}
return applicationLocale;
}
function srGetStrBundleWithLocale(path, locale)
function srGetStrBundle(path)
{
var strBundle = null;
@ -39,19 +16,13 @@ function srGetStrBundleWithLocale(path, locale)
}
}
strBundle = strBundleService.CreateBundle(path, locale);
strBundle = strBundleService.createBundle(path);
if (!strBundle) {
dump("\n--** strBundle createInstance failed **--\n");
}
return strBundle;
}
function srGetStrBundle(path)
{
var appLocale = srGetAppLocale();
return srGetStrBundleWithLocale(path, appLocale);
}
function selectLocale(event)
{
try {

11
xpinstall/src/nsInstall.cpp
Просмотреть файл

@ -181,8 +181,7 @@ nsInstall::nsInstall(nsIZipReader * theJARFile)
if (NS_SUCCEEDED(rv) && service)
{
nsILocale* locale = nsnull;
rv = service->CreateBundle( XPINSTALL_BUNDLE_URL, locale,
rv = service->CreateBundle( XPINSTALL_BUNDLE_URL,
getter_AddRefs(mStringBundle) );
}
}
@ -1167,7 +1166,6 @@ nsInstall::LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aRetur
nsCOMPtr<nsIFile> resFile;
nsCOMPtr<nsIFileURL> resFileURL = nsnull;
nsIURI *url = nsnull;
nsILocale* locale = nsnull;
nsIStringBundleService* service = nsnull;
nsIEventQueueService* pEventQueueService = nsnull;
nsIStringBundle* bundle = nsnull;
@ -1231,11 +1229,11 @@ nsInstall::LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aRetur
nsCRT::free(spec);
return ret;
}
ret = service->CreateBundle(spec, locale, &bundle);
ret = service->CreateBundle(spec, &bundle);
nsCRT::free(spec);
}
#else
ret = service->CreateBundle(url, locale, &bundle);
ret = service->CreateBundle(url, &bundle);
#endif
if (NS_FAILED(ret))
goto cleanup;
@ -2487,10 +2485,9 @@ PRUnichar *GetTranslatedString(const PRUnichar* aString)
{
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
nsCOMPtr<nsIStringBundle> stringBundle;
nsILocale* locale = nsnull;
PRUnichar* translatedString;
nsresult rv = stringService->CreateBundle(kInstallLocaleProperties, locale, getter_AddRefs(stringBundle));
nsresult rv = stringService->CreateBundle(kInstallLocaleProperties, getter_AddRefs(stringBundle));
if (NS_FAILED(rv)) return nsnull;
rv = stringBundle->GetStringFromName(aString, &translatedString);

5
xpinstall/src/nsXPInstallManager.cpp
Просмотреть файл

@ -107,8 +107,7 @@ nsXPInstallManager::nsXPInstallManager()
(nsISupports**) &service );
if (NS_SUCCEEDED(rv) && service)
{
nsILocale* locale = nsnull;
rv = service->CreateBundle( XPINSTALL_BUNDLE_URL, locale,
rv = service->CreateBundle( XPINSTALL_BUNDLE_URL,
getter_AddRefs(mStringBundle) );
nsServiceManager::ReleaseService( kStringBundleServiceCID, service );
}
@ -319,7 +318,7 @@ PRBool nsXPInstallManager::ConfirmChromeInstall(nsIScriptGlobalObject* aGlobalOb
kStringBundleServiceCID, &rv );
if (NS_SUCCEEDED(rv) && bundleSvc)
{
rv = bundleSvc->CreateBundle( XPINSTALL_BUNDLE_URL, nsnull,
rv = bundleSvc->CreateBundle( XPINSTALL_BUNDLE_URL,
getter_AddRefs(xpiBundle) );
if (NS_SUCCEEDED(rv) && xpiBundle)
{