From cffdd2018231b520e9fd9d946e6c3416f380baed Mon Sep 17 00:00:00 2001 From: "anthonyd%netscape.com" Date: Sat, 14 Jul 2001 00:50:21 +0000 Subject: [PATCH] bug fix for 81288 -   removed from source when changing views r=kin@netscape.com sr=sfraser@netscape.com git-svn-id: svn://10.0.0.236/trunk@99255 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsPlaintextEditor.cpp | 8 +++++++- mozilla/editor/libeditor/text/nsPlaintextEditor.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mozilla/editor/base/nsPlaintextEditor.cpp b/mozilla/editor/base/nsPlaintextEditor.cpp index 140f3564b9d..ac5ae8f211d 100644 --- a/mozilla/editor/base/nsPlaintextEditor.cpp +++ b/mozilla/editor/base/nsPlaintextEditor.cpp @@ -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 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); diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index 140f3564b9d..ac5ae8f211d 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -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 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);