corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 21113.

Browse Source
This commit is contained in:
tbogard@aol.net
1999-12-08 05:00:51 +00:00
parent 8f85c2c613
commit ed485904ed
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/nsWebShell.cpp
View File

@@ -4544,15 +4544,17 @@ NS_IMETHODIMP nsWebShell::AddChild(nsIDocShellTreeItem *aChild)
return NS_OK; return NS_OK;
// Do some docShell Specific stuff. // Do some docShell Specific stuff.
PRUnichar *defaultCharset=nsnull; nsXPIDLString defaultCharset;
PRUnichar *forceCharset=nsnull; nsXPIDLString forceCharset;
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE); NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(mContentViewer); nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(mContentViewer);
if(muDV) if(muDV)
{ {
NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet (&defaultCharset), NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet(getter_Copies(defaultCharset)),
NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet (&forceCharset), NS_ERROR_FAILURE); NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet(getter_Copies(forceCharset)),
NS_ERROR_FAILURE);
} }
nsCOMPtr<nsIContentViewer> childCV; nsCOMPtr<nsIContentViewer> childCV;
NS_ENSURE_SUCCESS(childAsDocShell->GetContentViewer(getter_AddRefs(childCV)), NS_ENSURE_SUCCESS(childAsDocShell->GetContentViewer(getter_AddRefs(childCV)),

10
webshell/src/nsWebShell.cpp
View File

@@ -4544,15 +4544,17 @@ NS_IMETHODIMP nsWebShell::AddChild(nsIDocShellTreeItem *aChild)
return NS_OK; return NS_OK;
// Do some docShell Specific stuff. // Do some docShell Specific stuff.
PRUnichar *defaultCharset=nsnull; nsXPIDLString defaultCharset;
PRUnichar *forceCharset=nsnull; nsXPIDLString forceCharset;
NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE); NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE);
nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(mContentViewer); nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(mContentViewer);
if(muDV) if(muDV)
{ {
NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet (&defaultCharset), NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet(getter_Copies(defaultCharset)),
NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet (&forceCharset), NS_ERROR_FAILURE); NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet(getter_Copies(forceCharset)),
NS_ERROR_FAILURE);
} }
nsCOMPtr<nsIContentViewer> childCV; nsCOMPtr<nsIContentViewer> childCV;
NS_ENSURE_SUCCESS(childAsDocShell->GetContentViewer(getter_AddRefs(childCV)), NS_ENSURE_SUCCESS(childAsDocShell->GetContentViewer(getter_AddRefs(childCV)),