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

Slightly better fix for crashes. b=96108 r=neil sr=bzbarsky a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@162785 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org 2004-09-25 06:22:48 +00:00
parent d41c255a7c
commit 85ad756fdf
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3352,14 +3352,13 @@ nsHTMLEditRules::WillMakeBasicBlock(nsISelection *aSelection,
// remember our new block for postprocessing
mNewBlock = theBlock;
// delete anything that was in the list of nodes
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes.SafeObjectAt(0);
while (curNode)
for (PRInt32 j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
if (NS_FAILED(res)) return res;
res = arrayOfNodes.RemoveObjectAt(0);
if (NS_FAILED(res)) return res;
curNode = arrayOfNodes.SafeObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -3493,14 +3492,13 @@ nsHTMLEditRules::WillCSSIndent(nsISelection *aSelection, PRBool *aCancel, PRBool
mNewBlock = theBlock;
RelativeChangeIndentationOfElementNode(theBlock, +1);
// delete anything that was in the list of nodes
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes.SafeObjectAt(0);
while (curNode)
for (PRInt32 j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
if (NS_FAILED(res)) return res;
res = arrayOfNodes.RemoveObjectAt(0);
if (NS_FAILED(res)) return res;
curNode = arrayOfNodes.SafeObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -3640,14 +3638,13 @@ nsHTMLEditRules::WillHTMLIndent(nsISelection *aSelection, PRBool *aCancel, PRBoo
// remember our new block for postprocessing
mNewBlock = theBlock;
// delete anything that was in the list of nodes
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes.SafeObjectAt(0);
while (curNode)
for (PRInt32 j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
if (NS_FAILED(res)) return res;
res = arrayOfNodes.RemoveObjectAt(0);
if (NS_FAILED(res)) return res;
curNode = arrayOfNodes.SafeObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -8701,14 +8698,13 @@ nsHTMLEditRules::WillAbsolutePosition(nsISelection *aSelection, PRBool *aCancel,
// remember our new block for postprocessing
mNewBlock = thePositionedDiv;
// delete anything that was in the list of nodes
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes.SafeObjectAt(0);
while (curNode)
for (PRInt32 j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
if (NS_FAILED(res)) return res;
res = arrayOfNodes.RemoveObjectAt(0);
if (NS_FAILED(res)) return res;
curNode = arrayOfNodes.SafeObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(thePositionedDiv,0);