making string conversions explicit, and converting global static returning function to the canonical form

htmlparser/src/nsHTMLToTXTSinkStream.cpp

@@ -851,7 +851,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
     {
       EnsureVerticalSpace(mEmptyLines+1);
     }
-    else Write(" ");
+    else Write(NS_ConvertASCIItoUCS2(" "));
   }
   else if (type == eHTMLTag_hr &&
            (mFlags & nsIDocumentEncoder::OutputFormatted))

htmlparser/src/nsParserNode.cpp

@@ -32,11 +32,10 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kClassIID, NS_PARSER_NODE_IID); 
 static NS_DEFINE_IID(kIParserNodeIID, NS_IPARSER_NODE_IID); 
 
-nsString& GetEmptyString() {
-  static nsString* gEmptyStr=0;
-  if(!gEmptyStr)
-    gEmptyStr=new nsString;
-  return *gEmptyStr;
+static
+const nsString& GetEmptyString() {
+  static nsString gEmptyStr;
+  return gEmptyStr;
 }
 
 /**

parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp

@@ -851,7 +851,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
     {
       EnsureVerticalSpace(mEmptyLines+1);
     }
-    else Write(" ");
+    else Write(NS_ConvertASCIItoUCS2(" "));
   }
   else if (type == eHTMLTag_hr &&
            (mFlags & nsIDocumentEncoder::OutputFormatted))

parser/htmlparser/src/nsParserNode.cpp

@@ -32,11 +32,10 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kClassIID, NS_PARSER_NODE_IID); 
 static NS_DEFINE_IID(kIParserNodeIID, NS_IPARSER_NODE_IID); 
 
-nsString& GetEmptyString() {
-  static nsString* gEmptyStr=0;
-  if(!gEmptyStr)
-    gEmptyStr=new nsString;
-  return *gEmptyStr;
+static
+const nsString& GetEmptyString() {
+  static nsString gEmptyStr;
+  return gEmptyStr;
 }
 
 /**