зеркало из https://github.com/mozilla/pjs.git
Got rid of nsIRDFDocument: we never use it here anyway.
This commit is contained in:
Родитель
6561ba3f3c
Коммит
d03a226d75
|
@ -458,7 +458,6 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
nsIDocument* doc = nsnull;
|
nsIDocument* doc = nsnull;
|
||||||
nsIRDFDocument* rdfDoc = nsnull;
|
|
||||||
nsIDocumentViewer* docv = nsnull;
|
nsIDocumentViewer* docv = nsnull;
|
||||||
nsIRDFContentModelBuilder* builder = nsnull;
|
nsIRDFContentModelBuilder* builder = nsnull;
|
||||||
|
|
||||||
|
@ -472,15 +471,8 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
*/
|
*/
|
||||||
if (NS_FAILED(rv = nsRepository::CreateInstance(kCXULDocumentCID,
|
if (NS_FAILED(rv = nsRepository::CreateInstance(kCXULDocumentCID,
|
||||||
nsnull,
|
nsnull,
|
||||||
kIRDFDocumentIID,
|
kIDocumentIID,
|
||||||
(void **)&rdfDoc)))
|
(void **)&doc)))
|
||||||
goto done;
|
|
||||||
|
|
||||||
// Take the RDF document and set its document type (so it knows
|
|
||||||
// whether it's handling RDF or XUL.
|
|
||||||
rdfDoc->SetContentType(aContentType);
|
|
||||||
|
|
||||||
if (NS_FAILED(rv = rdfDoc->QueryInterface(kIDocumentIID, (void**) &doc)))
|
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -511,7 +503,6 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
done:
|
done:
|
||||||
NS_IF_RELEASE(doc);
|
NS_IF_RELEASE(doc);
|
||||||
NS_IF_RELEASE(builder);
|
NS_IF_RELEASE(builder);
|
||||||
NS_IF_RELEASE(rdfDoc);
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -458,7 +458,6 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
nsIDocument* doc = nsnull;
|
nsIDocument* doc = nsnull;
|
||||||
nsIRDFDocument* rdfDoc = nsnull;
|
|
||||||
nsIDocumentViewer* docv = nsnull;
|
nsIDocumentViewer* docv = nsnull;
|
||||||
nsIRDFContentModelBuilder* builder = nsnull;
|
nsIRDFContentModelBuilder* builder = nsnull;
|
||||||
|
|
||||||
|
@ -472,15 +471,8 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
*/
|
*/
|
||||||
if (NS_FAILED(rv = nsRepository::CreateInstance(kCXULDocumentCID,
|
if (NS_FAILED(rv = nsRepository::CreateInstance(kCXULDocumentCID,
|
||||||
nsnull,
|
nsnull,
|
||||||
kIRDFDocumentIID,
|
kIDocumentIID,
|
||||||
(void **)&rdfDoc)))
|
(void **)&doc)))
|
||||||
goto done;
|
|
||||||
|
|
||||||
// Take the RDF document and set its document type (so it knows
|
|
||||||
// whether it's handling RDF or XUL.
|
|
||||||
rdfDoc->SetContentType(aContentType);
|
|
||||||
|
|
||||||
if (NS_FAILED(rv = rdfDoc->QueryInterface(kIDocumentIID, (void**) &doc)))
|
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -511,7 +503,6 @@ nsDocFactoryImpl::CreateRDFDocument(const char* aContentType, nsIURL* aURL,
|
||||||
done:
|
done:
|
||||||
NS_IF_RELEASE(doc);
|
NS_IF_RELEASE(doc);
|
||||||
NS_IF_RELEASE(builder);
|
NS_IF_RELEASE(builder);
|
||||||
NS_IF_RELEASE(rdfDoc);
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче