This commit is contained in:
cata%netscape.com 2000-01-13 23:18:35 +00:00
Родитель ce2f72d531
Коммит 2bf4869923
1 изменённых файлов: 37 добавлений и 0 удалений

Просмотреть файл

@ -340,6 +340,7 @@ NS_IMPL_ISUPPORTS(nsExtensibleStringBundle, NS_GET_IID(nsIStringBundle));
nsExtensibleStringBundle::nsExtensibleStringBundle(const char * aRegistryKey, nsExtensibleStringBundle::nsExtensibleStringBundle(const char * aRegistryKey,
nsILocale * aLocale, nsILocale * aLocale,
nsresult * aResult) nsresult * aResult)
:mBundle(NULL)
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
@ -348,6 +349,7 @@ nsExtensibleStringBundle::nsExtensibleStringBundle(const char * aRegistryKey,
nsIRegistry * registry = NULL; nsIRegistry * registry = NULL;
nsRegistryKey uconvKey, key; nsRegistryKey uconvKey, key;
nsIStringBundleService * sbServ = NULL; nsIStringBundleService * sbServ = NULL;
PRBool regOpen = PR_FALSE;
// get the Bundle Service // get the Bundle Service
res = nsServiceManager::GetService(kStringBundleServiceCID, res = nsServiceManager::GetService(kStringBundleServiceCID,
@ -359,6 +361,13 @@ nsExtensibleStringBundle::nsExtensibleStringBundle(const char * aRegistryKey,
NS_GET_IID(nsIRegistry), (nsISupports**)&registry); NS_GET_IID(nsIRegistry), (nsISupports**)&registry);
if (NS_FAILED(res)) goto done; if (NS_FAILED(res)) goto done;
// open registry if necessary
registry->IsOpen(&regOpen);
if (!regOpen) {
res = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(res)) goto done;
}
// get subtree // get subtree
res = registry->GetSubtree(nsIRegistry::Common, res = registry->GetSubtree(nsIRegistry::Common,
aRegistryKey, &uconvKey); aRegistryKey, &uconvKey);
@ -420,6 +429,8 @@ done:
kStringBundleServiceCID, sbServ); kStringBundleServiceCID, sbServ);
NS_IF_RELEASE(components); NS_IF_RELEASE(components);
*aResult = res;
} }
nsExtensibleStringBundle::~nsExtensibleStringBundle() nsExtensibleStringBundle::~nsExtensibleStringBundle()
@ -607,6 +618,32 @@ nsStringBundleService::CreateXPCBundle(const char *aURLSpec, const PRUnichar *aL
return ret; return ret;
} }
NS_IMETHODIMP
NS_NewStringBundleService(nsISupports* aOuter, const nsIID& aIID,
void** aResult)
{
nsresult rv;
if (!aResult) {
return NS_ERROR_INVALID_POINTER;
}
if (aOuter) {
*aResult = nsnull;
return NS_ERROR_NO_AGGREGATION;
}
nsStringBundleService * inst = new nsStringBundleService();
if (inst == NULL) {
*aResult = nsnull;
return NS_ERROR_OUT_OF_MEMORY;
}
rv = inst->QueryInterface(aIID, aResult);
if (NS_FAILED(rv)) {
delete inst;
*aResult = nsnull;
}
return rv;
}
NS_GENERIC_FACTORY_CONSTRUCTOR(nsStringBundleService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsStringBundleService)
static nsModuleComponentInfo components[] = static nsModuleComponentInfo components[] =