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

Fixing one more part of bug 209699. Replace NS_Convert* with Copy/Append*. r=dwitte@stanford.edu, sr=alecf@flett.org.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@144012 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2003-06-21 00:26:28 +00:00
parent 1c1e0c7bb4
commit 45f72e0474
20 changed files with 107 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -4338,7 +4338,8 @@ HTMLContentSink::ScrollToRef(PRBool aReallyScroll)
nsresult rv = NS_ERROR_FAILURE;
// We assume that the bytes are in UTF-8, as it says in the spec:
// http://www.w3.org/TR/html4/appendix/notes.html#h-B.2.1
nsAutoString ref = NS_ConvertUTF8toUCS2(unescapedRef);
nsAutoString ref;
CopyUTF8toUTF16(unescapedRef, ref);
PRInt32 i, ns = mDocument->GetNumberOfShells();
for (i = 0; i < ns; i++) {

24
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1865,8 +1865,7 @@ nsHTMLDocument::GetBaseURI(nsAString &aURI)
nsCAutoString spec;
uri->GetSpec(spec);
// XXX: CopyUTF8toUCS2()?
aURI = NS_ConvertUTF8toUCS2(spec);
CopyUTF8toUTF16(spec, aURI);
}
return NS_OK;
@@ -1952,7 +1951,8 @@ nsHTMLDocument::GetDomain(nsAString& aDomain)
nsCAutoString hostName;
if (NS_FAILED(uri->GetHost(hostName)))
return NS_ERROR_FAILURE;
aDomain.Assign(NS_ConvertUTF8toUCS2(hostName));
CopyUTF8toUTF16(hostName, aDomain);
return NS_OK;
}
@@ -2044,14 +2044,14 @@ nsHTMLDocument::WasDomainSet(PRBool* aDomainWasSet)
NS_IMETHODIMP
nsHTMLDocument::GetURL(nsAString& aURL)
{
nsCAutoString str;
if (mDocumentURL) {
nsCAutoString str;
mDocumentURL->GetSpec(str);
aURL.Assign(NS_ConvertUTF8toUCS2(str));
} else {
aURL.Truncate();
}
CopyUTF8toUTF16(str, aURL);
return NS_OK;
}
@@ -4626,13 +4626,11 @@ nsHTMLDocument::QueryCommandValue(const nsAString & commandID,
if (cmdToDispatch.Equals("cmd_fontFace"))
rv = cmdParams->GetStringValue("state_attribute", _retval);
else {
char *cStringResult = nsnull;
rv = cmdParams->GetCStringValue("state_attribute", &cStringResult);
if (NS_SUCCEEDED(rv) && cStringResult && cStringResult[0])
_retval.Assign(NS_ConvertUTF8toUCS2(cStringResult));
nsXPIDLCString cStringResult;
rv = cmdParams->GetCStringValue("state_attribute",
getter_Copies(cStringResult));
if (cStringResult)
nsMemory::Free(cStringResult);
CopyUTF8toUTF16(cStringResult, _retval);
}
return rv;