Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 382527, r=neil, sr=peterv, a=1.9+

Browse Source
This commit is contained in:
Olli.Pettay@helsinki.fi 2007-08-25 05:37:38 -07:00
parent 8ba7a348f3
commit 32d2200f6f
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
editor/libeditor/base/nsEditor.cpp
View File

@ -4789,10 +4789,6 @@ nsEditor::CreateTxnForDeleteSelection(nsIEditor::EDirection aAction,
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
*aTxn = nsnull; *aTxn = nsnull;
#ifdef DEBUG_akkana
NS_ASSERTION(aAction != eNextWord && aAction != ePreviousWord && aAction != eToEndOfLine, "CreateTxnForDeleteSelection: unsupported action!");
#endif
nsCOMPtr<nsISelectionController> selCon = do_QueryReferent(mSelConWeak); nsCOMPtr<nsISelectionController> selCon = do_QueryReferent(mSelConWeak);
if (!selCon) return NS_ERROR_NOT_INITIALIZED; if (!selCon) return NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsISelection> selection; nsCOMPtr<nsISelection> selection;
@ -4827,18 +4823,23 @@ nsEditor::CreateTxnForDeleteSelection(nsIEditor::EDirection aAction,
range->GetCollapsed(&isCollapsed); range->GetCollapsed(&isCollapsed);
if (!isCollapsed) if (!isCollapsed)
{ {
DeleteRangeTxn *txn; nsRefPtr<EditTxn> editTxn;
result = TransactionFactory::GetNewTransaction(DeleteRangeTxn::GetCID(), (EditTxn **)&txn); result =
TransactionFactory::GetNewTransaction(DeleteRangeTxn::GetCID(),
getter_AddRefs(editTxn));
nsRefPtr<DeleteRangeTxn> txn =
static_cast<DeleteRangeTxn*>(editTxn.get());
if (NS_SUCCEEDED(result) && txn) if (NS_SUCCEEDED(result) && txn)
{ {
txn->Init(this, range, &mRangeUpdater); txn->Init(this, range, &mRangeUpdater);
(*aTxn)->AppendChild(txn); (*aTxn)->AppendChild(txn);
NS_RELEASE(txn);
} }
else else
result = NS_ERROR_OUT_OF_MEMORY; result = NS_ERROR_OUT_OF_MEMORY;
} }
else // Same with range as with selection; if it is collapsed and action
// is eNone, do nothing.
else if (aAction != eNone)
{ // we have an insertion point. delete the thing in front of it or behind it, depending on aAction { // we have an insertion point. delete the thing in front of it or behind it, depending on aAction
result = CreateTxnForDeleteInsertionPoint(range, aAction, *aTxn, aNode, aOffset, aLength); result = CreateTxnForDeleteInsertionPoint(range, aAction, *aTxn, aNode, aOffset, aLength);
} }
@ -5022,14 +5023,14 @@ nsEditor::CreateTxnForDeleteInsertionPoint(nsIDOMRange *aRange,
{ {
if (nodeAsText) if (nodeAsText)
{ // we have text, so delete a char at the proper offset { // we have text, so delete a char at the proper offset
DeleteTextTxn *txn; nsRefPtr<DeleteTextTxn> txn;
result = CreateTxnForDeleteCharacter(nodeAsText, offset, aAction, &txn); result = CreateTxnForDeleteCharacter(nodeAsText, offset, aAction,
getter_AddRefs(txn));
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
aTxn->AppendChild(txn); aTxn->AppendChild(txn);
NS_ADDREF(*aNode = node); NS_ADDREF(*aNode = node);
*aOffset = txn->GetOffset(); *aOffset = txn->GetOffset();
*aLength = txn->GetNumCharsToDelete(); *aLength = txn->GetNumCharsToDelete();
NS_RELEASE(txn);
} }
} }
else else
@ -5055,25 +5056,25 @@ nsEditor::CreateTxnForDeleteInsertionPoint(nsIDOMRange *aRange,
{ {
selectedNodeAsText->GetLength(&position); selectedNodeAsText->GetLength(&position);
} }
DeleteTextTxn *delTextTxn; nsRefPtr<DeleteTextTxn> delTextTxn;
result = CreateTxnForDeleteCharacter(selectedNodeAsText, position, result = CreateTxnForDeleteCharacter(selectedNodeAsText, position,
aAction, &delTextTxn); aAction,
getter_AddRefs(delTextTxn));
if (NS_FAILED(result)) { return result; } if (NS_FAILED(result)) { return result; }
if (!delTextTxn) { return NS_ERROR_NULL_POINTER; } if (!delTextTxn) { return NS_ERROR_NULL_POINTER; }
aTxn->AppendChild(delTextTxn); aTxn->AppendChild(delTextTxn);
NS_ADDREF(*aNode = selectedNode); NS_ADDREF(*aNode = selectedNode);
*aOffset = delTextTxn->GetOffset(); *aOffset = delTextTxn->GetOffset();
*aLength = delTextTxn->GetNumCharsToDelete(); *aLength = delTextTxn->GetNumCharsToDelete();
NS_RELEASE(delTextTxn);
} }
else else
{ {
DeleteElementTxn *delElementTxn; nsRefPtr<DeleteElementTxn> delElementTxn;
result = CreateTxnForDeleteElement(selectedNode, &delElementTxn); result = CreateTxnForDeleteElement(selectedNode,
getter_AddRefs(delElementTxn));
if (NS_FAILED(result)) { return result; } if (NS_FAILED(result)) { return result; }
if (!delElementTxn) { return NS_ERROR_NULL_POINTER; } if (!delElementTxn) { return NS_ERROR_NULL_POINTER; }
aTxn->AppendChild(delElementTxn); aTxn->AppendChild(delElementTxn);
NS_RELEASE(delElementTxn);
NS_ADDREF(*aNode = selectedNode); NS_ADDREF(*aNode = selectedNode);
} }
} }