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

Fixed crash in table editing, b=217717, r=mozeditor, sr=dbaron, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@148367 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%jivamedia.com
2003-10-24 23:01:30 +00:00
parent 6d358001c6
commit 0bb2275d67
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/editor/libeditor/html/nsTableEditor.cpp
View File

@@ -801,25 +801,20 @@ nsHTMLEditor::InsertTableRow(PRInt32 aNumber, PRBool aAfter)
}
// Editor helper only
// XXX Code changed for bug 217717 and now we don't need aSelection param
// TODO: Remove aSelection param
NS_IMETHODIMP
nsHTMLEditor::DeleteTable2(nsIDOMElement *aTable, nsISelection *aSelection)
{
if (!aTable || !aSelection) return NS_ERROR_NULL_POINTER;
if (!aTable) return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIDOMNode> tableParent;
PRInt32 tableOffset;
if(!aTable || NS_FAILED(aTable->GetParentNode(getter_AddRefs(tableParent))) || !tableParent)
return NS_ERROR_FAILURE;
// Save offset we need to restore the selection
if(NS_FAILED(GetChildOffset(aTable, tableParent, tableOffset)))
return NS_ERROR_FAILURE;
nsresult res = DeleteNode(aTable);
// Select the table
nsresult res = ClearSelection();
if (NS_SUCCEEDED(res))
res = AppendNodeToSelectionAsRange(aTable);
if (NS_FAILED(res)) return res;
// Place selection just before the table
return aSelection->Collapse(tableParent, tableOffset);
return DeleteSelection(nsIEditor::eNext);
}
NS_IMETHODIMP