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

better fix for 242973, mapi send with ui with html compose and linebreaks, that doesn't break editing html drafts/templates, sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@161085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com 2004-08-20 23:46:07 +00:00
parent 4ea71b20a4
commit e7ebf59ed8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/mailnews/compose/src/nsMsgCompose.cpp
View File

@ -469,11 +469,6 @@ nsMsgCompose::ConvertAndLoadComposeWindow(nsString& aPrefix,
TranslateLineEnding(aBuf);
TranslateLineEnding(aSignature);
// this is probably a mapi send, so we need to replace '\n' with <br>
// so that the line breaks won't be lost by html.
if (!aQuoted && aHTMLEditor)
aBuf.ReplaceSubstring(NS_LITERAL_STRING("\n").get(), NS_LITERAL_STRING("<br>").get());
// We're going to be inserting stuff, and MsgComposeCommands
// may have set the editor to readonly in the recycled case.
// So set it back to writable.
@ -3541,6 +3536,12 @@ nsMsgCompose::BuildBodyMessageAndSignature()
if (addSignature)
ProcessSignature(m_identity, PR_FALSE, &tSignature);
// if type is new, but we have body, this is probably a mapi send, so we need to
// replace '\n' with <br> so that the line breaks won't be lost by html.
// if mailtourl, do the same.
if (m_composeHTML && (mType == nsIMsgCompType::New || mType == nsIMsgCompType::MailToUrl))
body.ReplaceSubstring(NS_LITERAL_STRING("\n").get(), NS_LITERAL_STRING("<br>").get());
nsString empty;
rv = ConvertAndLoadComposeWindow(empty, body, tSignature,
PR_FALSE, m_composeHTML);