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

Bug 777292 - editor/: Remove conversions to nsresult that will always result in NS_SUCCEEDED; r=ehsan

Browse Source
This commit is contained in:
Aryeh Gregor 2012-07-27 16:46:48 +03:00
parent 386204e06e
commit 829da4acf9
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/libeditor/html/nsHTMLEditRules.cpp
View File

@ -3349,8 +3349,7 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
NS_ENSURE_SUCCESS(res, res);
res = arrayOfNodes.RemoveObjectAt(0);
NS_ENSURE_SUCCESS(res, res);
arrayOfNodes.RemoveObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -3483,8 +3482,7 @@ nsHTMLEditRules::WillCSSIndent(Selection* aSelection,
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
NS_ENSURE_SUCCESS(res, res);
res = arrayOfNodes.RemoveObjectAt(0);
NS_ENSURE_SUCCESS(res, res);
arrayOfNodes.RemoveObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -3670,8 +3668,7 @@ nsHTMLEditRules::WillHTMLIndent(Selection* aSelection,
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
NS_ENSURE_SUCCESS(res, res);
res = arrayOfNodes.RemoveObjectAt(0);
NS_ENSURE_SUCCESS(res, res);
arrayOfNodes.RemoveObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(theBlock,0);
@ -8641,8 +8638,7 @@ nsHTMLEditRules::WillAbsolutePosition(Selection* aSelection,
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[0];
res = mHTMLEditor->DeleteNode(curNode);
NS_ENSURE_SUCCESS(res, res);
res = arrayOfNodes.RemoveObjectAt(0);
NS_ENSURE_SUCCESS(res, res);
arrayOfNodes.RemoveObjectAt(0);
}
// put selection in new block
res = aSelection->Collapse(thePositionedDiv,0);

3
editor/libeditor/text/nsPlaintextEditor.cpp
View File

@ -994,8 +994,7 @@ nsPlaintextEditor::SetWrapWidth(PRInt32 aWrapColumn)
// Get the current style for this root element:
nsAutoString styleValue;
nsresult res = rootElement->GetAttr(kNameSpaceID_None, nsGkAtoms::style, styleValue);
NS_ENSURE_SUCCESS(res, res);
rootElement->GetAttr(kNameSpaceID_None, nsGkAtoms::style, styleValue);
// We'll replace styles for these values:
CutStyle("white-space", styleValue);