зеркало из https://github.com/mozilla/gecko-dev.git
bug fix for 81288 -   removed from source when changing views
r=kin@netscape.com sr=sfraser@netscape.com
This commit is contained in:
Родитель
2133b79907
Коммит
f88d5c6fa3
|
@ -1530,8 +1530,14 @@ nsPlaintextEditor::OutputToString(nsAWritableString& aOutputString,
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsAutoString charsetStr;
|
||||
rv = GetDocumentCharacterSet(charsetStr);
|
||||
if(NS_FAILED(rv) || charsetStr.IsEmpty())
|
||||
charsetStr = NS_LITERAL_STRING("ISO-8859-1");
|
||||
|
||||
nsCOMPtr<nsIDocumentEncoder> encoder;
|
||||
rv = GetAndInitDocEncoder(aFormatType, aFlags, NS_LITERAL_STRING(""), getter_AddRefs(encoder));
|
||||
rv = GetAndInitDocEncoder(aFormatType, aFlags, charsetStr, getter_AddRefs(encoder));
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
rv = encoder->EncodeToString(aOutputString);
|
||||
|
|
|
@ -1530,8 +1530,14 @@ nsPlaintextEditor::OutputToString(nsAWritableString& aOutputString,
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsAutoString charsetStr;
|
||||
rv = GetDocumentCharacterSet(charsetStr);
|
||||
if(NS_FAILED(rv) || charsetStr.IsEmpty())
|
||||
charsetStr = NS_LITERAL_STRING("ISO-8859-1");
|
||||
|
||||
nsCOMPtr<nsIDocumentEncoder> encoder;
|
||||
rv = GetAndInitDocEncoder(aFormatType, aFlags, NS_LITERAL_STRING(""), getter_AddRefs(encoder));
|
||||
rv = GetAndInitDocEncoder(aFormatType, aFlags, charsetStr, getter_AddRefs(encoder));
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
rv = encoder->EncodeToString(aOutputString);
|
||||
|
|
Загрузка…
Ссылка в новой задаче