Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

29312: move nbsp guard to a more general location so it'll always fire

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@63368 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com
2000-03-18 04:35:45 +00:00
parent fbaca24345
commit b31452915c
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@@ -772,8 +772,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
else if (type == eHTMLTag_entity)
{
PRUnichar entity = nsHTMLEntities::EntityToUnicode(aNode.GetText());
nsAutoString temp;
temp.Append(entity);
nsAutoString temp(entity);
Write(temp);
}
else if (type == eHTMLTag_br)
@@ -846,12 +845,6 @@ void nsHTMLToTXTSinkStream::EnsureBufferSize(PRInt32 aNewSize)
void nsHTMLToTXTSinkStream::EncodeToBuffer(nsString& aSrc)
{
// First, replace all nbsp characters with spaces,
// which the unicode encoder won't do for us.
PRUnichar nbsp = 160;
PRUnichar space = ' ';
aSrc.ReplaceChar(nbsp, space);
if (mUnicodeEncoder == nsnull)
{
NS_WARNING("The unicode encoder needs to be initialized");
@@ -913,6 +906,12 @@ nsHTMLToTXTSinkStream::FlushLine()
*/
void nsHTMLToTXTSinkStream::WriteSimple(nsString& aString)
{
// First, replace all nbsp characters with spaces,
// which the unicode encoder won't do for us.
static PRUnichar nbsp = 160;
static PRUnichar space = ' ';
aString.ReplaceChar(nbsp, space);
// If a encoder is being used then convert first convert the input string
if (mUnicodeEncoder != nsnull)
{