From e424cc7f285e8ef1bfe041dafe26d4c22debcf17 Mon Sep 17 00:00:00 2001 From: "jfrancis%netscape.com" Date: Fri, 21 Jul 2000 22:06:48 +0000 Subject: [PATCH] fix for 33213; r=sfraser git-svn-id: svn://10.0.0.236/trunk@74603 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsHTMLEditRules.cpp | 4 ++++ mozilla/editor/libeditor/html/nsHTMLEditRules.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index 0677470009e..badcde06628 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -1946,10 +1946,14 @@ nsHTMLEditRules::WillIndent(nsIDOMSelection *aSelection, PRBool *aCancel, PRBool if (NS_FAILED(res)) return res; res = mEditor->CreateNode(quoteType, curParent, offset, getter_AddRefs(curQuote)); if (NS_FAILED(res)) return res; + +/* !!!!!!!!!!!!!!! TURNED OFF PER BUG 33213 !!!!!!!!!!!!!!!!!!!! // set style to not have unwanted vertical margins nsCOMPtr quoteElem = do_QueryInterface(curQuote); res = mEditor->SetAttribute(quoteElem, NS_ConvertASCIItoUCS2("style"), NS_ConvertASCIItoUCS2("margin: 0 0 0 40px;")); if (NS_FAILED(res)) return res; +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ + // curQuote is now the correct thing to put curNode in } diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index 0677470009e..badcde06628 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -1946,10 +1946,14 @@ nsHTMLEditRules::WillIndent(nsIDOMSelection *aSelection, PRBool *aCancel, PRBool if (NS_FAILED(res)) return res; res = mEditor->CreateNode(quoteType, curParent, offset, getter_AddRefs(curQuote)); if (NS_FAILED(res)) return res; + +/* !!!!!!!!!!!!!!! TURNED OFF PER BUG 33213 !!!!!!!!!!!!!!!!!!!! // set style to not have unwanted vertical margins nsCOMPtr quoteElem = do_QueryInterface(curQuote); res = mEditor->SetAttribute(quoteElem, NS_ConvertASCIItoUCS2("style"), NS_ConvertASCIItoUCS2("margin: 0 0 0 40px;")); if (NS_FAILED(res)) return res; +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ + // curQuote is now the correct thing to put curNode in }