Replace nsTextFormatter by NS_ConvertUTF8toUCS2, bug 105527, r=ducarroz, sr=bienvenu.

mailnews/addrbook/src/nsDirPrefs.cpp

@@ -298,12 +298,6 @@ void DIR_SetFileName(char** filename, const char* leafName);
 static PRInt32 PR_CALLBACK dir_ServerPrefCallback(const char *pref, void *inst_data);
 
 
-// This can now use nsTextFormatter. 
-// e.g.
-// #include "nsTextFormatter.h"
-// nsString aString(""); 
-// nsAutoString fmt("%s"); 
-// PRUnichar *uniBuffer = nsTextFormatter::smprintf(fmt.get(), aBuffer); // this converts UTF-8 to UCS-2 
 // Do not use void* that was inherited from old libmime when it could not include C++, use PRUnichar* instead.
 PRInt32 INTL_ConvertToUnicode(const char* aBuffer, const PRInt32 aLength,
                                       void** uniBuffer)

mailnews/base/src/nsMessenger.cpp

@@ -47,7 +47,6 @@
 #include "nsEscape.h"
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
-#include "nsTextFormatter.h"
 #include "nsIFileSpec.h"
 #ifdef XP_MAC
 #include "nsIAppleFileDecoder.h"
@@ -1765,20 +1764,7 @@ nsSaveMsgListener::OnDataAvailable(nsIRequest* request,
       if (NS_SUCCEEDED(rv))
       {
         if ( (m_doCharsetConversion) && (m_outputFormat.EqualsWithConversion(TEXT_PLAIN)) )
-        {
+          m_msgBuffer.Append(NS_ConvertUTF8toUCS2(m_dataBuffer, readCount));
-          PRUnichar       *u = nsnull; 
-          nsAutoString    fmt; fmt.AssignWithConversion("%s");
-          
-          u = nsTextFormatter::smprintf(fmt.get(), m_dataBuffer); // this converts UTF-8 to UCS-2 
-          if (u)
-          {
-            PRInt32   newLen = nsCRT::strlen(u);
-            m_msgBuffer.Append(u, newLen);
-            PR_FREEIF(u);
-          }
-          else
-            m_msgBuffer.AppendWithConversion(m_dataBuffer, readCount);
-        }
         else
           rv = m_outputStream->Write(m_dataBuffer, readCount, &writeCount);
 

mailnews/compose/src/nsMsgCompose.cpp

@@ -72,7 +72,6 @@
 #include "nsMsgPrompts.h"
 #include "nsMimeTypes.h"
 #include "nsICharsetConverterManager.h"
-#include "nsTextFormatter.h"
 #include "nsIEditor.h"
 #include "nsIPlaintextEditor.h"
 #include "nsEscape.h"
@@ -1782,20 +1781,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnDataAvailable(nsIRequest *request,
 		rv = NS_OK;
 	newBuf[numWritten] = '\0';
 	if (NS_SUCCEEDED(rv) && numWritten > 0)
-	{
+    mMsgBody.Append(NS_ConvertUTF8toUCS2(newBuf, numWritten));
-    PRUnichar       *u = nsnull; 
-    nsAutoString    fmt; fmt.Assign(NS_LITERAL_STRING("%s"));
-
-    u = nsTextFormatter::smprintf(fmt.get(), newBuf); // this converts UTF-8 to UCS-2 
-    if (u)
-    {
-      PRInt32   newLen = nsCRT::strlen(u);
-      mMsgBody.Append(u, newLen);
-      PR_FREEIF(u);
-    }
-    else
-      mMsgBody.AppendWithConversion(newBuf, numWritten);
-	}
 
 	PR_FREEIF(newBuf);
 	return rv;