Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 01:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bugs 17234,17416 r=tor,bruce

Browse Source
This commit is contained in:
pavlov%netscape.com 1999-10-29 08:36:47 +00:00
parent e2212a0323
commit 9c63f59cdd
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/src/nsChromeRegistry.cpp
View File

@ -473,7 +473,8 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
overlayFile += "/";
overlayFile += "overlays.rdf";
void *data = mDataSourceTable->Get(&nsStringKey(overlayFile));
nsStringKey skey(overlayFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
@ -563,7 +564,8 @@ NS_IMETHODIMP nsChromeRegistry::LoadDataSource(const nsCAutoString &aFileName, n
mDataSourceTable = new nsSupportsHashtable;
nsCOMPtr<nsISupports> supports = do_QueryInterface(remote);
mDataSourceTable->Put(&nsStringKey(aFileName), (void*)supports.get());
nsStringKey skey(aFileName);
mDataSourceTable->Put(&skey, (void*)supports.get());
return NS_OK;
}
@ -587,7 +589,8 @@ nsChromeRegistry::InitializeDataSource(nsString &aPackage,
if (mDataSourceTable)
{
// current.rdf and overlays.rdf are loaded in pairs and so if one is loaded, the other should be too.
void *data = mDataSourceTable->Get(&nsStringKey(chromeFile));
nsStringKey skey(chromeFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
{
nsCOMPtr<nsIRDFDataSource> dataSource;

9
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -473,7 +473,8 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
overlayFile += "/";
overlayFile += "overlays.rdf";
void *data = mDataSourceTable->Get(&nsStringKey(overlayFile));
nsStringKey skey(overlayFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
@ -563,7 +564,8 @@ NS_IMETHODIMP nsChromeRegistry::LoadDataSource(const nsCAutoString &aFileName, n
mDataSourceTable = new nsSupportsHashtable;
nsCOMPtr<nsISupports> supports = do_QueryInterface(remote);
mDataSourceTable->Put(&nsStringKey(aFileName), (void*)supports.get());
nsStringKey skey(aFileName);
mDataSourceTable->Put(&skey, (void*)supports.get());
return NS_OK;
}
@ -587,7 +589,8 @@ nsChromeRegistry::InitializeDataSource(nsString &aPackage,
if (mDataSourceTable)
{
// current.rdf and overlays.rdf are loaded in pairs and so if one is loaded, the other should be too.
void *data = mDataSourceTable->Get(&nsStringKey(chromeFile));
nsStringKey skey(chromeFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
{
nsCOMPtr<nsIRDFDataSource> dataSource;