зеркало из https://github.com/mozilla/pjs.git
More massaging to allow for XML docs with no webshells.
This commit is contained in:
Родитель
0bc4c0eb6c
Коммит
fb4b11f8c8
|
@ -207,7 +207,7 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand,
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsIWebShell* webShell;
|
||||
nsIWebShell* webShell = nsnull;
|
||||
nsAutoString charset("UTF-8");
|
||||
nsCharsetSource charsetSource = kCharsetFromDocTypeDefault;
|
||||
|
||||
|
@ -263,7 +263,8 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand,
|
|||
if (NS_OK == rv) {
|
||||
nsIXMLContentSink* sink;
|
||||
|
||||
rv = aContainer->QueryInterface(kIWebShellIID, (void**)&webShell);
|
||||
if (aContainer)
|
||||
rv = aContainer->QueryInterface(kIWebShellIID, (void**)&webShell);
|
||||
|
||||
if(NS_SUCCEEDED(rv) && (nsnull != webShell)) {
|
||||
nsCOMPtr<nsIContentViewer> cv;
|
||||
|
|
|
@ -207,7 +207,7 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand,
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsIWebShell* webShell;
|
||||
nsIWebShell* webShell = nsnull;
|
||||
nsAutoString charset("UTF-8");
|
||||
nsCharsetSource charsetSource = kCharsetFromDocTypeDefault;
|
||||
|
||||
|
@ -263,7 +263,8 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand,
|
|||
if (NS_OK == rv) {
|
||||
nsIXMLContentSink* sink;
|
||||
|
||||
rv = aContainer->QueryInterface(kIWebShellIID, (void**)&webShell);
|
||||
if (aContainer)
|
||||
rv = aContainer->QueryInterface(kIWebShellIID, (void**)&webShell);
|
||||
|
||||
if(NS_SUCCEEDED(rv) && (nsnull != webShell)) {
|
||||
nsCOMPtr<nsIContentViewer> cv;
|
||||
|
|
Загрузка…
Ссылка в новой задаче