From df6fc2c67e6c97b90593104fbf61ad7de03b665d Mon Sep 17 00:00:00 2001 From: "bratell%lysator.liu.se" Date: Tue, 7 Nov 2000 20:02:54 +0000 Subject: [PATCH] Fix for 59181. HTML lists and format=flowed don't work together. The solution is to disable flow when lines are indented. r=akkana sr=vidur git-svn-id: svn://10.0.0.236/trunk@82389 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsPlainTextSerializer.cpp | 5 ++++- mozilla/layout/base/src/nsPlainTextSerializer.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp index 556803e39ba..b639f667bb7 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp @@ -1176,8 +1176,11 @@ nsPlainTextSerializer::EndLine(PRBool softlinebreak) ' ' == mCurrentLine[--linelength]) { mCurrentLine.SetLength(linelength); } - if(mFlags & nsIDocumentEncoder::OutputFormatFlowed) { + if((mFlags & nsIDocumentEncoder::OutputFormatFlowed) && + (mIndent == 0)) { // Add the soft part of the soft linebreak (RFC 2646 4.1) + // We only do this when there is no indentation since format=flowed + // lines and indentation doesn't work well together. mCurrentLine.AppendWithConversion(' '); } mCurrentLine.Append(mLineBreak); diff --git a/mozilla/layout/base/src/nsPlainTextSerializer.cpp b/mozilla/layout/base/src/nsPlainTextSerializer.cpp index 556803e39ba..b639f667bb7 100644 --- a/mozilla/layout/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/layout/base/src/nsPlainTextSerializer.cpp @@ -1176,8 +1176,11 @@ nsPlainTextSerializer::EndLine(PRBool softlinebreak) ' ' == mCurrentLine[--linelength]) { mCurrentLine.SetLength(linelength); } - if(mFlags & nsIDocumentEncoder::OutputFormatFlowed) { + if((mFlags & nsIDocumentEncoder::OutputFormatFlowed) && + (mIndent == 0)) { // Add the soft part of the soft linebreak (RFC 2646 4.1) + // We only do this when there is no indentation since format=flowed + // lines and indentation doesn't work well together. mCurrentLine.AppendWithConversion(' '); } mCurrentLine.Append(mLineBreak);