wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 748313 part 1 - Remove unused argument to nsHTMLEditor::IsTextPropertySetByContent; r=ehsan

Browse Source
This commit is contained in:
Aryeh Gregor 2012-05-03 10:09:44 +03:00
parent f34010ce9c
commit 0d8f909e57
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7437,11 +7437,11 @@ nsHTMLEditRules::CacheInlineStyles(nsIDOMNode *aNode)
{
bool isSet = false;
nsAutoString outValue;
nsCOMPtr<nsIDOMNode> resultNode;
if (!useCSS)
{
mHTMLEditor->IsTextPropertySetByContent(aNode, mCachedStyles[j].tag, &(mCachedStyles[j].attr), nsnull,
isSet, getter_AddRefs(resultNode), &outValue);
mHTMLEditor->IsTextPropertySetByContent(aNode, mCachedStyles[j].tag,
&(mCachedStyles[j].attr), nsnull,
isSet, &outValue);
}
else
{

1
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -3907,7 +3907,6 @@ void nsHTMLEditor::IsTextPropertySetByContent(nsIDOMNode *aNode,
const nsAString *aAttribute,
const nsAString *aValue,
bool &aIsSet,
nsIDOMNode **aStyleNode,
nsAString *outValue)
{
nsresult result;

16
editor/libeditor/html/nsHTMLEditor.h
View File

@ -546,16 +546,14 @@ protected:
* @param aValue The value of aAttribute, example: blue in <FONT color="blue">
* May be null. Ignored if aAttribute is null.
* @param aIsSet [OUT] true if <aProperty aAttribute=aValue> effects aNode.
* @param aStyleNode [OUT] set to the node representing <aProperty aAttribute=aValue>, if found.
* null if aIsSet is returned as false;
* @param outValue [OUT] the value of the attribute, if aIsSet is true
*/
virtual void IsTextPropertySetByContent(nsIDOMNode *aNode,
nsIAtom *aProperty,
const nsAString *aAttribute,
const nsAString *aValue,
bool &aIsSet,
nsIDOMNode **aStyleNode,
nsAString *outValue = nsnull);
void IsTextPropertySetByContent(nsIDOMNode* aNode,
nsIAtom* aProperty,
const nsAString* aAttribute,
const nsAString* aValue,
bool& aIsSet,
nsAString* outValue = nsnull);
// Methods for handling plaintext quotations
NS_IMETHOD PasteAsPlaintextQuotation(PRInt32 aSelectionType);

11
editor/libeditor/html/nsHTMLEditorStyle.cpp
View File

@ -302,8 +302,7 @@ nsHTMLEditor::SetInlinePropertyOnTextNode( nsIDOMCharacterData *aTextNode,
}
else
{
nsCOMPtr<nsIDOMNode> styleNode;
IsTextPropertySetByContent(node, aProperty, aAttribute, aValue, bHasProp, getter_AddRefs(styleNode));
IsTextPropertySetByContent(node, aProperty, aAttribute, aValue, bHasProp);
}
if (bHasProp) return NS_OK;
@ -1040,9 +1039,8 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
return NS_OK;
}
if (!useCSS) {
nsCOMPtr<nsIDOMNode> resultNode;
IsTextPropertySetByContent(collapsedNode, aProperty, aAttribute, aValue,
isSet, getter_AddRefs(resultNode), outValue);
isSet, outValue);
*aFirst = *aAny = *aAll = isSet;
if (!isSet && aCheckDefaults) {
@ -1111,7 +1109,6 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
}
if (node) {
bool isSet = false;
nsCOMPtr<nsIDOMNode> resultNode;
if (first) {
if (mHTMLCSSUtils->IsCSSEditableProperty(node, aProperty,
aAttribute) &&
@ -1129,7 +1126,7 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
COMPUTED_STYLE_TYPE);
} else {
IsTextPropertySetByContent(node, aProperty, aAttribute, aValue, isSet,
getter_AddRefs(resultNode), &firstValue);
&firstValue);
}
*aFirst = isSet;
first = false;
@ -1152,7 +1149,7 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
COMPUTED_STYLE_TYPE);
} else {
IsTextPropertySetByContent(node, aProperty, aAttribute, aValue, isSet,
getter_AddRefs(resultNode), &theValue);
&theValue);
}
if (firstValue != theValue) {
*aAll = false;