mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 830132 r=ehsan
This commit is contained in:
parent
79665a28e9
commit
e577dac5c1
@ -95,7 +95,7 @@ NS_IMETHODIMP InsertElementTxn::DoTransaction(void)
|
||||
}
|
||||
|
||||
// note, it's ok for refContent to be null. that means append
|
||||
nsIContent* refContent = parent->GetChildAt(mOffset);
|
||||
nsCOMPtr<nsIContent> refContent = parent->GetChildAt(mOffset);
|
||||
|
||||
mEditor->MarkNodeDirty(mNode);
|
||||
|
||||
|
@ -51,12 +51,12 @@ NS_IMETHODIMP JoinElementTxn::Init(nsEditor *aEditor,
|
||||
if (!aEditor || !aLeftNode || !aRightNode) { return NS_ERROR_NULL_POINTER; }
|
||||
mEditor = aEditor;
|
||||
mLeftNode = aLeftNode;
|
||||
nsINode* leftParent = mLeftNode->GetParentNode();
|
||||
nsCOMPtr<nsINode> leftParent = mLeftNode->GetParentNode();
|
||||
if (!mEditor->IsModifiableNode(leftParent)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
mRightNode = aRightNode;
|
||||
mOffset=0;
|
||||
mOffset = 0;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -138,7 +138,7 @@ NS_IMETHODIMP JoinElementTxn::UndoTransaction(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
for (nsINode* child = mRightNode->GetFirstChild();
|
||||
for (nsCOMPtr<nsINode> child = mRightNode->GetFirstChild();
|
||||
child;
|
||||
child = child->GetNextSibling())
|
||||
{
|
||||
|
@ -201,7 +201,7 @@ NS_IMETHODIMP SplitElementTxn::RedoTransaction(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
nsINode* child = mExistingRightNode->GetFirstChild();
|
||||
nsCOMPtr<nsINode> child = mExistingRightNode->GetFirstChild();
|
||||
for (int32_t i=0; i<mOffset; i++)
|
||||
{
|
||||
if (!child) {return NS_ERROR_NULL_POINTER;}
|
||||
|
Loading…
Reference in New Issue
Block a user