diff options
Diffstat (limited to 'accessible/windows/sdn/sdnAccessible.cpp')
| -rw-r--r-- | accessible/windows/sdn/sdnAccessible.cpp | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/accessible/windows/sdn/sdnAccessible.cpp b/accessible/windows/sdn/sdnAccessible.cpp index 909b0779c..d90631c8f 100644 --- a/accessible/windows/sdn/sdnAccessible.cpp +++ b/accessible/windows/sdn/sdnAccessible.cpp @@ -28,8 +28,6 @@ using namespace mozilla::a11y; STDMETHODIMP sdnAccessible::QueryInterface(REFIID aREFIID, void** aInstancePtr) { - A11Y_TRYBLOCK_BEGIN - if (!aInstancePtr) return E_FAIL; *aInstancePtr = nullptr; @@ -53,8 +51,6 @@ sdnAccessible::QueryInterface(REFIID aREFIID, void** aInstancePtr) } return E_NOINTERFACE; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -65,8 +61,6 @@ sdnAccessible::get_nodeInfo(BSTR __RPC_FAR* aNodeName, unsigned int __RPC_FAR* aUniqueID, unsigned short __RPC_FAR* aNodeType) { - A11Y_TRYBLOCK_BEGIN - if (!aNodeName || !aNameSpaceID || !aNodeValue || !aNumChildren || !aUniqueID || !aNodeType) return E_INVALIDARG; @@ -114,8 +108,6 @@ sdnAccessible::get_nodeInfo(BSTR __RPC_FAR* aNodeName, *aNumChildren = mNode->GetChildCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -125,8 +117,6 @@ sdnAccessible::get_attributes(unsigned short aMaxAttribs, BSTR __RPC_FAR* aAttribValues, unsigned short __RPC_FAR* aNumAttribs) { - A11Y_TRYBLOCK_BEGIN - if (!aAttribNames || !aNameSpaceIDs || !aAttribValues || !aNumAttribs) return E_INVALIDARG; @@ -159,8 +149,6 @@ sdnAccessible::get_attributes(unsigned short aMaxAttribs, } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -169,8 +157,6 @@ sdnAccessible::get_attributesForNames(unsigned short aMaxAttribs, short __RPC_FAR* aNameSpaceID, BSTR __RPC_FAR* aAttribValues) { - A11Y_TRYBLOCK_BEGIN - if (!aAttribNames || !aNameSpaceID || !aAttribValues) return E_INVALIDARG; @@ -207,8 +193,6 @@ sdnAccessible::get_attributesForNames(unsigned short aMaxAttribs, } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -218,8 +202,6 @@ sdnAccessible::get_computedStyle(unsigned short aMaxStyleProperties, BSTR __RPC_FAR* aStyleValues, unsigned short __RPC_FAR* aNumStyleProperties) { - A11Y_TRYBLOCK_BEGIN - if (!aStyleProperties || aStyleValues || !aNumStyleProperties) return E_INVALIDARG; @@ -257,8 +239,6 @@ sdnAccessible::get_computedStyle(unsigned short aMaxStyleProperties, *aNumStyleProperties = static_cast<unsigned short>(realIndex); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -267,8 +247,6 @@ sdnAccessible::get_computedStyleForProperties(unsigned short aNumStyleProperties BSTR __RPC_FAR* aStyleProperties, BSTR __RPC_FAR* aStyleValues) { - A11Y_TRYBLOCK_BEGIN - if (!aStyleProperties || !aStyleValues) return E_INVALIDARG; @@ -291,15 +269,11 @@ sdnAccessible::get_computedStyleForProperties(unsigned short aNumStyleProperties } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::scrollTo(boolean aScrollTopLeft) { - A11Y_TRYBLOCK_BEGIN - DocAccessible* document = GetDocument(); if (!document) // that's IsDefunct check return CO_E_OBJNOTCONNECTED; @@ -313,15 +287,11 @@ sdnAccessible::scrollTo(boolean aScrollTopLeft) nsCoreUtils::ScrollTo(document->PresShell(), mNode->AsContent(), scrollType); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -336,15 +306,11 @@ sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -359,15 +325,11 @@ sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -382,15 +344,11 @@ sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -405,15 +363,11 @@ sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -428,16 +382,12 @@ sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_childAt(unsigned aChildIndex, ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode) { - A11Y_TRYBLOCK_BEGIN - if (!aNode) return E_INVALIDARG; *aNode = nullptr; @@ -453,15 +403,11 @@ sdnAccessible::get_childAt(unsigned aChildIndex, return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_innerHTML(BSTR __RPC_FAR* aInnerHTML) { - A11Y_TRYBLOCK_BEGIN - if (!aInnerHTML) return E_INVALIDARG; *aInnerHTML = nullptr; @@ -482,15 +428,11 @@ sdnAccessible::get_innerHTML(BSTR __RPC_FAR* aInnerHTML) return E_OUTOFMEMORY; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_localInterface(void __RPC_FAR *__RPC_FAR* aLocalInterface) { - A11Y_TRYBLOCK_BEGIN - if (!aLocalInterface) return E_INVALIDARG; *aLocalInterface = nullptr; @@ -502,15 +444,11 @@ sdnAccessible::get_localInterface(void __RPC_FAR *__RPC_FAR* aLocalInterface) AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP sdnAccessible::get_language(BSTR __RPC_FAR* aLanguage) { - A11Y_TRYBLOCK_BEGIN - if (!aLanguage) return E_INVALIDARG; *aLanguage = nullptr; @@ -534,6 +472,4 @@ sdnAccessible::get_language(BSTR __RPC_FAR* aLanguage) return E_OUTOFMEMORY; return S_OK; - - A11Y_TRYBLOCK_END } |