Changed flag for entity conversion, bug 27376, r=akkana.

git-svn-id: svn://10.0.0.236/trunk@63099 18797224-902f-48f8-a5cc-f745e15eee43
2000-03-16 00:28:01 +00:00
parent a8e353fa5f
commit f87a1e9e73
3 changed files with 12 additions and 3 deletions
--- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
+++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
@@ -232,8 +232,11 @@ nsHTMLContentSinkStream::InitEncoder()
    return res;
  // SaveAsCharset requires a const char* in its first argument:
  nsCAutoString charsetCString (charsetName);
+  // For ISO-8859-1 only, convert to entity first (always generate entites like &nbsp;).
  res = mUnicodeEncoder->Init(charsetCString,
-                              nsISaveAsCharset::attr_htmlTextDefault,
+                              charsetName.EqualsIgnoreCase("ISO-8859-1") ?
+                                nsISaveAsCharset::attr_htmlTextDefault :
+                                nsISaveAsCharset::attr_EntityAfterCharsetConv + nsISaveAsCharset::attr_FallbackDecimalNCR,
                              nsIEntityConverter::html40);
  return res;
 }