diff --git a/accessible/src/base/nsAccessibilityUtils.cpp b/accessible/src/base/nsAccessibilityUtils.cpp index 8dce24f5c8c..868c6c06c2d 100755 --- a/accessible/src/base/nsAccessibilityUtils.cpp +++ b/accessible/src/base/nsAccessibilityUtils.cpp @@ -259,7 +259,7 @@ nsAccUtils::SetAccAttrsForXULContainerItem(nsIDOMNode *aNode, PRBool nsAccUtils::HasListener(nsIContent *aContent, const nsAString& aEventType) { - NS_ENSURE_ARG_POINTER(aContent); + NS_ENSURE_TRUE(aContent, PR_FALSE); nsCOMPtr listenerManager; aContent->GetListenerManager(PR_FALSE, getter_AddRefs(listenerManager)); @@ -319,8 +319,8 @@ PRBool nsAccUtils::IsAncestorOf(nsIDOMNode *aPossibleAncestorNode, nsIDOMNode *aPossibleDescendantNode) { - NS_ENSURE_ARG_POINTER(aPossibleAncestorNode); - NS_ENSURE_ARG_POINTER(aPossibleDescendantNode); + NS_ENSURE_TRUE(aPossibleAncestorNode, PR_FALSE); + NS_ENSURE_TRUE(aPossibleDescendantNode, PR_FALSE); nsCOMPtr loopNode = aPossibleDescendantNode; nsCOMPtr parentNode; diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp index 1fc1b5a3b07..8d677f51233 100644 --- a/accessible/src/html/nsHTMLTableAccessible.cpp +++ b/accessible/src/html/nsHTMLTableAccessible.cpp @@ -921,7 +921,7 @@ PRBool nsHTMLTableAccessible::HasDescendant(char *aTagName, PRBool aAllowEmpty) nsAutoString tagName; tagName.AssignWithConversion(aTagName); tableElt->GetElementsByTagName(tagName, getter_AddRefs(nodeList)); - NS_ENSURE_TRUE(nodeList, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(nodeList, PR_FALSE); PRUint32 length; nodeList->GetLength(&length); diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp index ea19e2b2d7e..67b09962fcf 100644 --- a/accessible/src/xul/nsXULTreeAccessible.cpp +++ b/accessible/src/xul/nsXULTreeAccessible.cpp @@ -878,7 +878,7 @@ nsXULTreeitemAccessible::IsDefunct() PRBool nsXULTreeitemAccessible::IsExpandable() { if (IsDefunct()) - return NS_ERROR_FAILURE; + return PR_FALSE; PRBool isContainer; mTreeView->IsContainer(mRow, &isContainer);