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

updating 83378 work with the correct patch this time

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@124363 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com 2002-06-30 02:52:56 +00:00
parent 6160a4f8fd
commit c54d33f095
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
View File

@ -1564,7 +1564,7 @@ nsHTMLEditRules::SplitMailCites(nsISelection *aSelection, PRBool aPlaintext, PRB
// it means the break wont end up making an empty line that happens to be inside a
// mailquote. The latter can confuse a user if they click there and start typing,
// because being in the mailquote may affect wrapping behavior, or font color, etc.
nsWSRunObject wsObj(mHTMLEditor, selNode, newOffset);
nsWSRunObject wsObj(mHTMLEditor, selNode, selOffset);
nsCOMPtr<nsIDOMNode> visNode;
PRInt32 visOffset=0;
PRInt16 wsType;
@ -1599,7 +1599,7 @@ nsHTMLEditRules::SplitMailCites(nsISelection *aSelection, PRBool aPlaintext, PRB
// if citeNode wasn't a block, we might also want another break before it.
// We need to examine the content both before the br we just added and also
// just after it. If we dont have another br or block boundary adjacent,
// then we will ned a 2nd br added to achieve blank line that user expects.
// then we will need a 2nd br added to achieve blank line that user expects.
if (IsInlineNode(citeNode))
{
nsWSRunObject wsObj(mHTMLEditor, selNode, newOffset);
@ -1613,7 +1613,7 @@ nsHTMLEditRules::SplitMailCites(nsISelection *aSelection, PRBool aPlaintext, PRB
(wsType==nsWSRunObject::eSpecial))
{
nsWSRunObject wsObjAfterBR(mHTMLEditor, selNode, newOffset+1);
res = wsObj.NextVisibleNode(selNode, newOffset, address_of(visNode), &visOffset, &wsType);
res = wsObjAfterBR.NextVisibleNode(selNode, newOffset+1, address_of(visNode), &visOffset, &wsType);
if (NS_FAILED(res)) return res;
if ((wsType==nsWSRunObject::eNormalWS) ||
(wsType==nsWSRunObject::eText) ||

8
mozilla/editor/libeditor/html/nsWSRunObject.cpp
View File

@ -622,8 +622,8 @@ nsWSRunObject::PriorVisibleNode(nsIDOMNode *aNode,
}
// if we get here then nothing in ws data to find. return start reason
*outVisNode = mStartNode;
*outVisOffset = mStartOffset;
*outVisNode = mStartReasonNode;
*outVisOffset = mStartOffset; // this really isn't meaningful if mStartReasonNode!=mStartNode
*outType = mStartReason;
return NS_OK;
}
@ -677,8 +677,8 @@ nsWSRunObject::NextVisibleNode (nsIDOMNode *aNode,
}
// if we get here then nothing in ws data to find. return end reason
*outVisNode = mEndNode;
*outVisOffset = mEndOffset;
*outVisNode = mEndReasonNode;
*outVisOffset = mEndOffset; // this really isn't meaningful if mEndReasonNode!=mEndNode
*outType = mEndReason;
return NS_OK;
}