From 9998186f5886d5d79b016e53bbf942b54084152e Mon Sep 17 00:00:00 2001 From: "akkana%netscape.com" Date: Wed, 26 Jan 2000 02:19:53 +0000 Subject: [PATCH] 12560: don't output children of SELECT in plaintext output. r=mcafee git-svn-id: svn://10.0.0.236/trunk@58701 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp | 8 +++++++- mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp index fa59af4cb20..822c9b37a8d 100644 --- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -762,7 +762,13 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode) printf(" '%s' ", text.ToNewCString()); #endif - if (type == eHTMLTag_text) + if (mTagStackIndex > 1 && mTagStack[mTagStackIndex-2] == eHTMLTag_select) + { + // Don't output the contents of SELECT elements; + // Might be nice, eventually, to output just the selected element. + return NS_OK; + } + else if (type == eHTMLTag_text) { Write(text); } diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp index fa59af4cb20..822c9b37a8d 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -762,7 +762,13 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode) printf(" '%s' ", text.ToNewCString()); #endif - if (type == eHTMLTag_text) + if (mTagStackIndex > 1 && mTagStack[mTagStackIndex-2] == eHTMLTag_select) + { + // Don't output the contents of SELECT elements; + // Might be nice, eventually, to output just the selected element. + return NS_OK; + } + else if (type == eHTMLTag_text) { Write(text); }