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

fixing code that relied on implicit string construction

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76749 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2000-08-20 06:29:14 +00:00
parent c14e52c824
commit a5293d2dbe
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/mailnews/mime/src/mimedrft.cpp
View File

@@ -560,7 +560,7 @@ mime_intl_insert_message_header_1(char **body,
mime_SACat(body, ": ");
// MIME decode header and convert to UTF-8
nsAutoString ucs2 = mime_decode_string(*hdr_value);
nsAutoString ucs2(mime_decode_string(*hdr_value));
char* utf8 = ucs2.ToNewUTF8String();
if (NULL != utf8) {
mime_SACat(body, utf8);
@@ -1034,7 +1034,7 @@ mime_insert_forwarded_message_headers(char **body,
// convert body from mail charset to UTF-8
char *utf8 = NULL;
nsAutoString ucs2;
if (NS_SUCCEEDED(nsMsgI18NConvertToUnicode(mailcharset, *body, ucs2))) {
if (NS_SUCCEEDED(nsMsgI18NConvertToUnicode(nsCAutoString(mailcharset), nsCAutoString(*body), ucs2))) {
utf8 = ucs2.ToNewUTF8String();
if (NULL != utf8) {
PR_Free(*body);
@@ -1346,7 +1346,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
// convert from UTF-8 to UCS2
nsString ucs2;
if (NS_SUCCEEDED(nsMsgI18NConvertToUnicode("UTF-8", body, ucs2)))
if (NS_SUCCEEDED(nsMsgI18NConvertToUnicode(nsCAutoString("UTF-8"), nsCAutoString(body), ucs2)))
fields->SetBody(ucs2.GetUnicode());
else
fields->SetBody(NS_ConvertASCIItoUCS2(body).GetUnicode());

4
mozilla/mailnews/mime/src/mimemoz2.cpp
View File

@@ -2060,7 +2060,7 @@ nsresult GetMailNewsFont(MimeObject *obj, PRBool styleFixed, char *fontName, PRU
if (NS_FAILED(rv))
return rv;
rv = nsMsgI18NConvertFromUnicode("UTF-8", unicode, convertedStr);
rv = nsMsgI18NConvertFromUnicode(nsCAutoString("UTF-8"), nsAutoString(unicode), convertedStr);
PR_FREEIF(unicode);
if (NS_FAILED(rv))
return rv;
@@ -2087,7 +2087,7 @@ nsresult GetMailNewsFont(MimeObject *obj, PRBool styleFixed, char *fontName, PRU
if (NS_FAILED(rv))
return rv;
rv = nsMsgI18NConvertFromUnicode("UTF-8", unicode, convertedStr);
rv = nsMsgI18NConvertFromUnicode(nsCAutoString("UTF-8"), nsAutoString(unicode), convertedStr);
PR_FREEIF(unicode);
if (NS_FAILED(rv))
return rv;

2
mozilla/mailnews/mime/src/mimemsg.cpp
View File

@@ -781,7 +781,7 @@ static char *
MimeMessage_partial_message_html(const char *data, void *closure,
MimeHeaders *headers)
{
nsCAutoString orig_url = data;
nsCAutoString orig_url(data);
char *partialMsgHtml = nsnull;
char *uidl = MimeHeaders_get(headers, HEADER_X_UIDL, PR_FALSE, PR_FALSE);
char *msgId = MimeHeaders_get(headers, HEADER_MESSAGE_ID, PR_FALSE,

2
mozilla/mailnews/mime/src/nsStreamConverter.cpp
View File

@@ -607,7 +607,7 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList
if ( (newType != nsMimeOutput::nsMimeMessageDraftOrTemplate) &&
(newType != nsMimeOutput::nsMimeMessageEditorTemplate) )
{
nsCAutoString progID = "component://netscape/messenger/mimeemitter;type=";
nsCAutoString progID("component://netscape/messenger/mimeemitter;type=");
if (mOverrideFormat)
progID += mOverrideFormat;
else