Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making string conversions explicit

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@65029 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%netscape.com
2000-04-03 11:20:35 +00:00
parent 4e8cb518bc
commit e16ab47ebe
50 changed files with 275 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/content/base/src/nsDocumentViewer.cpp
View File

@@ -294,9 +294,7 @@ DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext)
: mPresContext(dont_QueryInterface(aPresContext))
{
NS_INIT_REFCNT();
mHintCharset = "";
mHintCharsetSource = kCharsetUninitialized;
mForceCharacterSet = "";
mAllowPlugins = PR_TRUE;
mEnableRendering = PR_TRUE;
mFilePointer = nsnull;
@@ -1501,9 +1499,9 @@ NS_IMETHODIMP DocumentViewerImpl::GetDefaultCharacterSet(PRUnichar** aDefaultCha
}
}
if ((nsnull == gDefCharset) || (nsnull == *gDefCharset))
mDefaultCharacterSet = "ISO-8859-1";
mDefaultCharacterSet.AssignWithConversion("ISO-8859-1");
else
mDefaultCharacterSet = gDefCharset;
mDefaultCharacterSet.AssignWithConversion(gDefCharset);
}
*aDefaultCharacterSet = mDefaultCharacterSet.ToNewUnicode();
return NS_OK;
@@ -1689,7 +1687,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged()
nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(scriptGlobalObject);
if (!domWindow) return NS_ERROR_FAILURE;
domWindow->UpdateCommands(nsAutoString("select"));
domWindow->UpdateCommands(NS_ConvertToString("select"));
mGotSelectionState = PR_TRUE;
mSelectionWasCollapsed = selectionCollapsed;
}