diff options
Diffstat (limited to 'accessible/windows/ia2')
| -rw-r--r-- | accessible/windows/ia2/ia2Accessible.cpp | 88 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleAction.cpp | 24 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleComponent.cpp | 12 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleEditableText.cpp | 24 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleHyperlink.cpp | 20 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleHypertext.cpp | 12 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleImage.cpp | 12 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleRelation.cpp | 20 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleTable.cpp | 124 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleTableCell.cpp | 36 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleText.cpp | 76 | ||||
| -rw-r--r-- | accessible/windows/ia2/ia2AccessibleValue.cpp | 16 |
12 files changed, 0 insertions, 464 deletions
diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp index c72719b51..97cd0d788 100644 --- a/accessible/windows/ia2/ia2Accessible.cpp +++ b/accessible/windows/ia2/ia2Accessible.cpp @@ -63,8 +63,6 @@ ia2Accessible::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2Accessible::get_nRelations(long* aNRelations) { - A11Y_TRYBLOCK_BEGIN - if (!aNRelations) return E_INVALIDARG; *aNRelations = 0; @@ -84,16 +82,12 @@ ia2Accessible::get_nRelations(long* aNRelations) (*aNRelations)++; } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_relation(long aRelationIndex, IAccessibleRelation** aRelation) { - A11Y_TRYBLOCK_BEGIN - if (!aRelation || aRelationIndex < 0) return E_INVALIDARG; *aRelation = nullptr; @@ -124,8 +118,6 @@ ia2Accessible::get_relation(long aRelationIndex, } return E_INVALIDARG; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -133,8 +125,6 @@ ia2Accessible::get_relations(long aMaxRelations, IAccessibleRelation** aRelation, long *aNRelations) { - A11Y_TRYBLOCK_BEGIN - if (!aRelation || !aNRelations || aMaxRelations <= 0) return E_INVALIDARG; *aNRelations = 0; @@ -160,15 +150,11 @@ ia2Accessible::get_relations(long aMaxRelations, } } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::role(long* aRole) { - A11Y_TRYBLOCK_BEGIN - if (!aRole) return E_INVALIDARG; *aRole = 0; @@ -204,15 +190,11 @@ ia2Accessible::role(long* aRole) } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::scrollTo(enum IA2ScrollType aScrollType) { - A11Y_TRYBLOCK_BEGIN - AccessibleWrap* acc = static_cast<AccessibleWrap*>(this); if (acc->IsDefunct()) return CO_E_OBJNOTCONNECTED; @@ -222,16 +204,12 @@ ia2Accessible::scrollTo(enum IA2ScrollType aScrollType) aScrollType); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::scrollToPoint(enum IA2CoordinateType aCoordType, long aX, long aY) { - A11Y_TRYBLOCK_BEGIN - AccessibleWrap* acc = static_cast<AccessibleWrap*>(this); if (acc->IsDefunct()) return CO_E_OBJNOTCONNECTED; @@ -244,8 +222,6 @@ ia2Accessible::scrollToPoint(enum IA2CoordinateType aCoordType, acc->ScrollToPoint(geckoCoordType, aX, aY); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -253,8 +229,6 @@ ia2Accessible::get_groupPosition(long* aGroupLevel, long* aSimilarItemsInGroup, long* aPositionInGroup) { - A11Y_TRYBLOCK_BEGIN - if (!aGroupLevel || !aSimilarItemsInGroup || !aPositionInGroup) return E_INVALIDARG; @@ -279,15 +253,11 @@ ia2Accessible::get_groupPosition(long* aGroupLevel, *aPositionInGroup = groupPos.posInSet; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_states(AccessibleStates* aStates) { - A11Y_TRYBLOCK_BEGIN - if (!aStates) return E_INVALIDARG; *aStates = 0; @@ -347,50 +317,36 @@ ia2Accessible::get_states(AccessibleStates* aStates) *aStates |= IA2_STATE_PINNED; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_extendedRole(BSTR* aExtendedRole) { - A11Y_TRYBLOCK_BEGIN - if (!aExtendedRole) return E_INVALIDARG; *aExtendedRole = nullptr; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_localizedExtendedRole(BSTR* aLocalizedExtendedRole) { - A11Y_TRYBLOCK_BEGIN - if (!aLocalizedExtendedRole) return E_INVALIDARG; *aLocalizedExtendedRole = nullptr; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_nExtendedStates(long* aNExtendedStates) { - A11Y_TRYBLOCK_BEGIN - if (!aNExtendedStates) return E_INVALIDARG; *aNExtendedStates = 0; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -398,16 +354,12 @@ ia2Accessible::get_extendedStates(long aMaxExtendedStates, BSTR** aExtendedStates, long* aNExtendedStates) { - A11Y_TRYBLOCK_BEGIN - if (!aExtendedStates || !aNExtendedStates) return E_INVALIDARG; *aExtendedStates = nullptr; *aNExtendedStates = 0; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -415,38 +367,28 @@ ia2Accessible::get_localizedExtendedStates(long aMaxLocalizedExtendedStates, BSTR** aLocalizedExtendedStates, long* aNLocalizedExtendedStates) { - A11Y_TRYBLOCK_BEGIN - if (!aLocalizedExtendedStates || !aNLocalizedExtendedStates) return E_INVALIDARG; *aLocalizedExtendedStates = nullptr; *aNLocalizedExtendedStates = 0; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_uniqueID(long* aUniqueID) { - A11Y_TRYBLOCK_BEGIN - if (!aUniqueID) return E_INVALIDARG; AccessibleWrap* acc = static_cast<AccessibleWrap*>(this); *aUniqueID = AccessibleWrap::GetChildIDFor(acc); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_windowHandle(HWND* aWindowHandle) { - A11Y_TRYBLOCK_BEGIN - if (!aWindowHandle) return E_INVALIDARG; *aWindowHandle = 0; @@ -457,15 +399,11 @@ ia2Accessible::get_windowHandle(HWND* aWindowHandle) *aWindowHandle = AccessibleWrap::GetHWNDFor(acc); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_indexInParent(long* aIndexInParent) { - A11Y_TRYBLOCK_BEGIN - if (!aIndexInParent) return E_INVALIDARG; *aIndexInParent = -1; @@ -481,15 +419,11 @@ ia2Accessible::get_indexInParent(long* aIndexInParent) return S_FALSE; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_locale(IA2Locale* aLocale) { - A11Y_TRYBLOCK_BEGIN - if (!aLocale) return E_INVALIDARG; @@ -532,15 +466,11 @@ ia2Accessible::get_locale(IA2Locale* aLocale) // country abbreviations or if there are more than one subcode. aLocale->variant = ::SysAllocString(lang.get()); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_attributes(BSTR* aAttributes) { - A11Y_TRYBLOCK_BEGIN - if (!aAttributes) return E_INVALIDARG; *aAttributes = nullptr; @@ -558,8 +488,6 @@ ia2Accessible::get_attributes(BSTR* aAttributes) MOZ_ASSERT(!acc->IsProxy()); return E_UNEXPECTED; - - A11Y_TRYBLOCK_END } //////////////////////////////////////////////////////////////////////////////// @@ -568,22 +496,16 @@ ia2Accessible::get_attributes(BSTR* aAttributes) STDMETHODIMP ia2Accessible::get_attribute(BSTR name, VARIANT* aAttribute) { - A11Y_TRYBLOCK_BEGIN - if (!aAttribute) return E_INVALIDARG; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_accessibleWithCaret(IUnknown** aAccessible, long* aCaretOffset) { - A11Y_TRYBLOCK_BEGIN - if (!aAccessible || !aCaretOffset) return E_INVALIDARG; @@ -611,8 +533,6 @@ ia2Accessible::get_accessibleWithCaret(IUnknown** aAccessible, (*aAccessible)->AddRef(); *aCaretOffset = caretOffset; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -621,8 +541,6 @@ ia2Accessible::get_relationTargetsOfType(BSTR aType, IUnknown*** aTargets, long* aNTargets) { - A11Y_TRYBLOCK_BEGIN - if (!aTargets || !aNTargets || aMaxTargets < 0) return E_INVALIDARG; *aNTargets = 0; @@ -663,16 +581,12 @@ ia2Accessible::get_relationTargetsOfType(BSTR aType, } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2Accessible::get_selectionRanges(IA2Range** aRanges, long *aNRanges) { - A11Y_TRYBLOCK_BEGIN - if (!aRanges || !aNRanges) return E_INVALIDARG; @@ -714,8 +628,6 @@ ia2Accessible::get_selectionRanges(IA2Range** aRanges, } return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleAction.cpp b/accessible/windows/ia2/ia2AccessibleAction.cpp index 0710b753f..ffd19f049 100644 --- a/accessible/windows/ia2/ia2AccessibleAction.cpp +++ b/accessible/windows/ia2/ia2AccessibleAction.cpp @@ -39,8 +39,6 @@ ia2AccessibleAction::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleAction::nActions(long* aActionCount) { - A11Y_TRYBLOCK_BEGIN - if (!aActionCount) return E_INVALIDARG; @@ -52,30 +50,22 @@ ia2AccessibleAction::nActions(long* aActionCount) *aActionCount = acc->ActionCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleAction::doAction(long aActionIndex) { - A11Y_TRYBLOCK_BEGIN - AccessibleWrap* acc = static_cast<AccessibleWrap*>(this); if (acc->IsDefunct()) return CO_E_OBJNOTCONNECTED; uint8_t index = static_cast<uint8_t>(aActionIndex); return acc->DoAction(index) ? S_OK : E_INVALIDARG; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleAction::get_description(long aActionIndex, BSTR *aDescription) { - A11Y_TRYBLOCK_BEGIN - if (!aDescription) return E_INVALIDARG; *aDescription = nullptr; @@ -93,8 +83,6 @@ ia2AccessibleAction::get_description(long aActionIndex, BSTR *aDescription) *aDescription = ::SysAllocStringLen(description.get(), description.Length()); return *aDescription ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -102,8 +90,6 @@ ia2AccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding, BSTR **aKeyBinding, long *aNumBinding) { - A11Y_TRYBLOCK_BEGIN - if (!aKeyBinding) return E_INVALIDARG; *aKeyBinding = nullptr; @@ -143,15 +129,11 @@ ia2AccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding, *aNumBinding = 1; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleAction::get_name(long aActionIndex, BSTR *aName) { - A11Y_TRYBLOCK_BEGIN - if (!aName) return E_INVALIDARG; @@ -169,20 +151,14 @@ ia2AccessibleAction::get_name(long aActionIndex, BSTR *aName) *aName = ::SysAllocStringLen(name.get(), name.Length()); return *aName ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleAction::get_localizedName(long aActionIndex, BSTR *aLocalizedName) { - A11Y_TRYBLOCK_BEGIN - if (!aLocalizedName) return E_INVALIDARG; *aLocalizedName = nullptr; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleComponent.cpp b/accessible/windows/ia2/ia2AccessibleComponent.cpp index f32c09d1e..2c9cd0ab4 100644 --- a/accessible/windows/ia2/ia2AccessibleComponent.cpp +++ b/accessible/windows/ia2/ia2AccessibleComponent.cpp @@ -41,8 +41,6 @@ ia2AccessibleComponent::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleComponent::get_locationInParent(long* aX, long* aY) { - A11Y_TRYBLOCK_BEGIN - if (!aX || !aY) return E_INVALIDARG; @@ -75,15 +73,11 @@ ia2AccessibleComponent::get_locationInParent(long* aX, long* aY) *aX = rect.x - parentRect.x; *aY = rect.y - parentRect.y; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleComponent::get_foreground(IA2Color* aForeground) { - A11Y_TRYBLOCK_BEGIN - if (!aForeground) return E_INVALIDARG; @@ -98,15 +92,11 @@ ia2AccessibleComponent::get_foreground(IA2Color* aForeground) *aForeground = frame->StyleColor()->mColor; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleComponent::get_background(IA2Color* aBackground) { - A11Y_TRYBLOCK_BEGIN - if (!aBackground) return E_INVALIDARG; @@ -121,7 +111,5 @@ ia2AccessibleComponent::get_background(IA2Color* aBackground) *aBackground = frame->StyleBackground()->mBackgroundColor; return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleEditableText.cpp b/accessible/windows/ia2/ia2AccessibleEditableText.cpp index 361d6a130..0b433bf6d 100644 --- a/accessible/windows/ia2/ia2AccessibleEditableText.cpp +++ b/accessible/windows/ia2/ia2AccessibleEditableText.cpp @@ -22,8 +22,6 @@ using namespace mozilla::a11y; STDMETHODIMP ia2AccessibleEditableText::copyText(long aStartOffset, long aEndOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -35,15 +33,11 @@ ia2AccessibleEditableText::copyText(long aStartOffset, long aEndOffset) textAcc->CopyText(aStartOffset, aEndOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleEditableText::deleteText(long aStartOffset, long aEndOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -55,15 +49,11 @@ ia2AccessibleEditableText::deleteText(long aStartOffset, long aEndOffset) textAcc->DeleteText(aStartOffset, aEndOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleEditableText::insertText(long aOffset, BSTR *aText) { - A11Y_TRYBLOCK_BEGIN - uint32_t length = ::SysStringLen(*aText); nsAutoString text(*aText, length); MOZ_ASSERT(!HyperTextProxyFor(this)); @@ -77,15 +67,11 @@ ia2AccessibleEditableText::insertText(long aOffset, BSTR *aText) textAcc->InsertText(text, aOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleEditableText::cutText(long aStartOffset, long aEndOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -97,15 +83,11 @@ ia2AccessibleEditableText::cutText(long aStartOffset, long aEndOffset) textAcc->CutText(aStartOffset, aEndOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleEditableText::pasteText(long aOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -117,16 +99,12 @@ ia2AccessibleEditableText::pasteText(long aOffset) textAcc->PasteText(aOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleEditableText::replaceText(long aStartOffset, long aEndOffset, BSTR *aText) { - A11Y_TRYBLOCK_BEGIN - HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); if (textAcc->IsDefunct()) return CO_E_OBJNOTCONNECTED; @@ -141,8 +119,6 @@ ia2AccessibleEditableText::replaceText(long aStartOffset, long aEndOffset, textAcc->InsertText(text, aStartOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP diff --git a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp index c6d564103..d36c0ef25 100644 --- a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp +++ b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp @@ -45,8 +45,6 @@ ia2AccessibleHyperlink::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleHyperlink::get_anchor(long aIndex, VARIANT* aAnchor) { - A11Y_TRYBLOCK_BEGIN - if (!aAnchor) return E_INVALIDARG; @@ -77,15 +75,11 @@ ia2AccessibleHyperlink::get_anchor(long aIndex, VARIANT* aAnchor) aAnchor->punkVal = static_cast<IUnknown*>(instancePtr); aAnchor->vt = VT_UNKNOWN; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHyperlink::get_anchorTarget(long aIndex, VARIANT* aAnchorTarget) { - A11Y_TRYBLOCK_BEGIN - if (!aAnchorTarget) { return E_INVALIDARG; } @@ -124,15 +118,11 @@ ia2AccessibleHyperlink::get_anchorTarget(long aIndex, VARIANT* aAnchorTarget) aAnchorTarget->bstrVal = ::SysAllocStringLen(stringURI.get(), stringURI.Length()); return aAnchorTarget->bstrVal ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHyperlink::get_startIndex(long* aIndex) { - A11Y_TRYBLOCK_BEGIN - if (!aIndex) return E_INVALIDARG; @@ -149,15 +139,11 @@ ia2AccessibleHyperlink::get_startIndex(long* aIndex) *aIndex = thisObj->StartOffset(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHyperlink::get_endIndex(long* aIndex) { - A11Y_TRYBLOCK_BEGIN - if (!aIndex) return E_INVALIDARG; @@ -174,15 +160,11 @@ ia2AccessibleHyperlink::get_endIndex(long* aIndex) *aIndex = thisObj->EndOffset(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHyperlink::get_valid(boolean* aValid) { - A11Y_TRYBLOCK_BEGIN - if (!aValid) return E_INVALIDARG; @@ -199,7 +181,5 @@ ia2AccessibleHyperlink::get_valid(boolean* aValid) *aValid = thisObj->IsLinkValid(); return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleHypertext.cpp b/accessible/windows/ia2/ia2AccessibleHypertext.cpp index f4b3bdaf2..555bde686 100644 --- a/accessible/windows/ia2/ia2AccessibleHypertext.cpp +++ b/accessible/windows/ia2/ia2AccessibleHypertext.cpp @@ -19,8 +19,6 @@ using namespace mozilla::a11y; STDMETHODIMP ia2AccessibleHypertext::get_nHyperlinks(long* aHyperlinkCount) { - A11Y_TRYBLOCK_BEGIN - if (!aHyperlinkCount) return E_INVALIDARG; @@ -34,16 +32,12 @@ ia2AccessibleHypertext::get_nHyperlinks(long* aHyperlinkCount) *aHyperlinkCount = hyperText->LinkCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHypertext::get_hyperlink(long aLinkIndex, IAccessibleHyperlink** aHyperlink) { - A11Y_TRYBLOCK_BEGIN - if (!aHyperlink) return E_INVALIDARG; @@ -65,15 +59,11 @@ ia2AccessibleHypertext::get_hyperlink(long aLinkIndex, static_cast<IAccessibleHyperlink*>(hyperLink); (*aHyperlink)->AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long* aHyperlinkIndex) { - A11Y_TRYBLOCK_BEGIN - if (!aHyperlinkIndex) return E_INVALIDARG; @@ -87,7 +77,5 @@ ia2AccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long* aHyperlinkInde *aHyperlinkIndex = hyperAcc->LinkIndexAtOffset(aCharIndex); return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleImage.cpp b/accessible/windows/ia2/ia2AccessibleImage.cpp index 989fde925..7dc7f765c 100644 --- a/accessible/windows/ia2/ia2AccessibleImage.cpp +++ b/accessible/windows/ia2/ia2AccessibleImage.cpp @@ -43,8 +43,6 @@ ia2AccessibleImage::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleImage::get_description(BSTR* aDescription) { - A11Y_TRYBLOCK_BEGIN - if (!aDescription) return E_INVALIDARG; @@ -61,8 +59,6 @@ ia2AccessibleImage::get_description(BSTR* aDescription) *aDescription = ::SysAllocStringLen(description.get(), description.Length()); return *aDescription ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -70,8 +66,6 @@ ia2AccessibleImage::get_imagePosition(enum IA2CoordinateType aCoordType, long* aX, long* aY) { - A11Y_TRYBLOCK_BEGIN - if (!aX || !aY) return E_INVALIDARG; @@ -90,15 +84,11 @@ ia2AccessibleImage::get_imagePosition(enum IA2CoordinateType aCoordType, *aX = pos.x; *aY = pos.y; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleImage::get_imageSize(long* aHeight, long* aWidth) { - A11Y_TRYBLOCK_BEGIN - if (!aHeight || !aWidth) return E_INVALIDARG; @@ -113,7 +103,5 @@ ia2AccessibleImage::get_imageSize(long* aHeight, long* aWidth) *aHeight = size.width; *aWidth = size.height; return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleRelation.cpp b/accessible/windows/ia2/ia2AccessibleRelation.cpp index cc6fd83c8..67435ee52 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.cpp +++ b/accessible/windows/ia2/ia2AccessibleRelation.cpp @@ -34,8 +34,6 @@ IMPL_IUNKNOWN_QUERY_TAIL STDMETHODIMP ia2AccessibleRelation::get_relationType(BSTR* aRelationType) { - A11Y_TRYBLOCK_BEGIN - if (!aRelationType) return E_INVALIDARG; @@ -51,43 +49,31 @@ ia2AccessibleRelation::get_relationType(BSTR* aRelationType) } return *aRelationType ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleRelation::get_localizedRelationType(BSTR *aLocalizedRelationType) { - A11Y_TRYBLOCK_BEGIN - if (!aLocalizedRelationType) return E_INVALIDARG; *aLocalizedRelationType = nullptr; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleRelation::get_nTargets(long *aNTargets) { - A11Y_TRYBLOCK_BEGIN - if (!aNTargets) return E_INVALIDARG; *aNTargets = mTargets.Length(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleRelation::get_target(long aTargetIndex, IUnknown **aTarget) { - A11Y_TRYBLOCK_BEGIN - if (aTargetIndex < 0 || (uint32_t)aTargetIndex >= mTargets.Length() || !aTarget) return E_INVALIDARG; @@ -97,16 +83,12 @@ ia2AccessibleRelation::get_target(long aTargetIndex, IUnknown **aTarget) (*aTarget)->AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleRelation::get_targets(long aMaxTargets, IUnknown **aTargets, long *aNTargets) { - A11Y_TRYBLOCK_BEGIN - if (!aNTargets || !aTargets) return E_INVALIDARG; @@ -120,6 +102,4 @@ ia2AccessibleRelation::get_targets(long aMaxTargets, IUnknown **aTargets, *aNTargets = maxTargets; return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleTable.cpp b/accessible/windows/ia2/ia2AccessibleTable.cpp index 6ac6bbab4..a99f72def 100644 --- a/accessible/windows/ia2/ia2AccessibleTable.cpp +++ b/accessible/windows/ia2/ia2AccessibleTable.cpp @@ -60,8 +60,6 @@ ia2AccessibleTable::get_accessibleAt(long aRowIdx, long aColIdx, STDMETHODIMP ia2AccessibleTable::get_caption(IUnknown** aAccessible) { - A11Y_TRYBLOCK_BEGIN - if (!aAccessible) return E_INVALIDARG; @@ -75,16 +73,12 @@ ia2AccessibleTable::get_caption(IUnknown** aAccessible) (*aAccessible = static_cast<IAccessible*>(caption))->AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_childIndex(long aRowIdx, long aColIdx, long* aChildIdx) { - A11Y_TRYBLOCK_BEGIN - if (!aChildIdx) return E_INVALIDARG; @@ -99,15 +93,11 @@ ia2AccessibleTable::get_childIndex(long aRowIdx, long aColIdx, *aChildIdx = mTable->CellIndexAt(aRowIdx, aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_columnDescription(long aColIdx, BSTR* aDescription) { - A11Y_TRYBLOCK_BEGIN - if (!aDescription) return E_INVALIDARG; @@ -125,16 +115,12 @@ ia2AccessibleTable::get_columnDescription(long aColIdx, BSTR* aDescription) *aDescription = ::SysAllocStringLen(descr.get(), descr.Length()); return *aDescription ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_columnExtentAt(long aRowIdx, long aColIdx, long* aSpan) { - A11Y_TRYBLOCK_BEGIN - if (!aSpan) return E_INVALIDARG; @@ -149,31 +135,23 @@ ia2AccessibleTable::get_columnExtentAt(long aRowIdx, long aColIdx, *aSpan = mTable->ColExtentAt(aRowIdx, aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_columnHeader(IAccessibleTable** aAccessibleTable, long* aStartingRowIndex) { - A11Y_TRYBLOCK_BEGIN - if (!aAccessibleTable || !aStartingRowIndex) return E_INVALIDARG; *aAccessibleTable = nullptr; *aStartingRowIndex = -1; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_columnIndex(long aCellIdx, long* aColIdx) { - A11Y_TRYBLOCK_BEGIN - if (!aColIdx) return E_INVALIDARG; @@ -187,15 +165,11 @@ ia2AccessibleTable::get_columnIndex(long aCellIdx, long* aColIdx) *aColIdx = mTable->ColIndexAt(aCellIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_nColumns(long* aColCount) { - A11Y_TRYBLOCK_BEGIN - if (!aColCount) return E_INVALIDARG; @@ -205,15 +179,11 @@ ia2AccessibleTable::get_nColumns(long* aColCount) *aColCount = mTable->ColCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_nRows(long* aRowCount) { - A11Y_TRYBLOCK_BEGIN - if (!aRowCount) return E_INVALIDARG; @@ -223,8 +193,6 @@ ia2AccessibleTable::get_nRows(long* aRowCount) *aRowCount = mTable->RowCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -236,8 +204,6 @@ ia2AccessibleTable::get_nSelectedChildren(long* aChildCount) STDMETHODIMP ia2AccessibleTable::get_nSelectedColumns(long* aColCount) { - A11Y_TRYBLOCK_BEGIN - if (!aColCount) return E_INVALIDARG; @@ -247,15 +213,11 @@ ia2AccessibleTable::get_nSelectedColumns(long* aColCount) *aColCount = mTable->SelectedColCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_nSelectedRows(long* aRowCount) { - A11Y_TRYBLOCK_BEGIN - if (!aRowCount) return E_INVALIDARG; @@ -266,15 +228,11 @@ ia2AccessibleTable::get_nSelectedRows(long* aRowCount) *aRowCount = mTable->SelectedRowCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_rowDescription(long aRowIdx, BSTR* aDescription) { - A11Y_TRYBLOCK_BEGIN - if (!aDescription) return E_INVALIDARG; @@ -292,15 +250,11 @@ ia2AccessibleTable::get_rowDescription(long aRowIdx, BSTR* aDescription) *aDescription = ::SysAllocStringLen(descr.get(), descr.Length()); return *aDescription ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_rowExtentAt(long aRowIdx, long aColIdx, long* aSpan) { - A11Y_TRYBLOCK_BEGIN - if (!aSpan) return E_INVALIDARG; @@ -315,31 +269,23 @@ ia2AccessibleTable::get_rowExtentAt(long aRowIdx, long aColIdx, long* aSpan) *aSpan = mTable->RowExtentAt(aRowIdx, aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_rowHeader(IAccessibleTable** aAccessibleTable, long* aStartingColumnIndex) { - A11Y_TRYBLOCK_BEGIN - if (!aAccessibleTable || !aStartingColumnIndex) return E_INVALIDARG; *aAccessibleTable = nullptr; *aStartingColumnIndex = -1; return E_NOTIMPL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_rowIndex(long aCellIdx, long* aRowIdx) { - A11Y_TRYBLOCK_BEGIN - if (!aRowIdx) return E_INVALIDARG; @@ -353,16 +299,12 @@ ia2AccessibleTable::get_rowIndex(long aCellIdx, long* aRowIdx) *aRowIdx = mTable->RowIndexAt(aCellIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedChildren(long aMaxChildren, long** aChildren, long* aNChildren) { - A11Y_TRYBLOCK_BEGIN - if (!aChildren || !aNChildren) return E_INVALIDARG; @@ -384,36 +326,24 @@ ia2AccessibleTable::get_selectedChildren(long aMaxChildren, long** aChildren, (*aChildren)[i] = cellIndices[i]; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedColumns(long aMaxColumns, long** aColumns, long* aNColumns) { - A11Y_TRYBLOCK_BEGIN - return get_selectedColumns(aColumns, aNColumns); - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedRows(long aMaxRows, long** aRows, long* aNRows) { - A11Y_TRYBLOCK_BEGIN - return get_selectedRows(aRows, aNRows); - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_summary(IUnknown** aAccessible) { - A11Y_TRYBLOCK_BEGIN - if (!aAccessible) return E_INVALIDARG; @@ -424,15 +354,11 @@ ia2AccessibleTable::get_summary(IUnknown** aAccessible) *aAccessible = nullptr; return S_FALSE; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_isColumnSelected(long aColIdx, boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aIsSelected) return E_INVALIDARG; @@ -445,15 +371,11 @@ ia2AccessibleTable::get_isColumnSelected(long aColIdx, boolean* aIsSelected) *aIsSelected = mTable->IsColSelected(aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_isRowSelected(long aRowIdx, boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aIsSelected) return E_INVALIDARG; @@ -466,16 +388,12 @@ ia2AccessibleTable::get_isRowSelected(long aRowIdx, boolean* aIsSelected) *aIsSelected = mTable->IsRowSelected(aRowIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_isSelected(long aRowIdx, long aColIdx, boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aIsSelected) return E_INVALIDARG; @@ -490,15 +408,11 @@ ia2AccessibleTable::get_isSelected(long aRowIdx, long aColIdx, *aIsSelected = mTable->IsCellSelected(aRowIdx, aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::selectRow(long aRowIdx) { - A11Y_TRYBLOCK_BEGIN - if (!mTable) return CO_E_OBJNOTCONNECTED; @@ -507,15 +421,11 @@ ia2AccessibleTable::selectRow(long aRowIdx) mTable->SelectRow(aRowIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::selectColumn(long aColIdx) { - A11Y_TRYBLOCK_BEGIN - if (!mTable) return CO_E_OBJNOTCONNECTED; @@ -524,15 +434,11 @@ ia2AccessibleTable::selectColumn(long aColIdx) mTable->SelectCol(aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::unselectRow(long aRowIdx) { - A11Y_TRYBLOCK_BEGIN - if (!mTable) return CO_E_OBJNOTCONNECTED; @@ -541,15 +447,11 @@ ia2AccessibleTable::unselectRow(long aRowIdx) mTable->UnselectRow(aRowIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::unselectColumn(long aColIdx) { - A11Y_TRYBLOCK_BEGIN - if (!mTable) return CO_E_OBJNOTCONNECTED; @@ -558,8 +460,6 @@ ia2AccessibleTable::unselectColumn(long aColIdx) mTable->UnselectCol(aColIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -569,8 +469,6 @@ ia2AccessibleTable::get_rowColumnExtentsAtIndex(long aCellIdx, long* aRowIdx, long* aColExtents, boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aRowIdx || !aColIdx || !aRowExtents || !aColExtents || !aIsSelected) return E_INVALIDARG; @@ -595,8 +493,6 @@ ia2AccessibleTable::get_rowColumnExtentsAtIndex(long aCellIdx, long* aRowIdx, *aIsSelected = mTable->IsCellSelected(rowIdx, colIdx); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -611,8 +507,6 @@ ia2AccessibleTable::get_modelChange(IA2TableModelChange* aModelChange) STDMETHODIMP ia2AccessibleTable::get_cellAt(long aRowIdx, long aColIdx, IUnknown** aCell) { - A11Y_TRYBLOCK_BEGIN - if (!aCell) return E_INVALIDARG; @@ -628,15 +522,11 @@ ia2AccessibleTable::get_cellAt(long aRowIdx, long aColIdx, IUnknown** aCell) (*aCell = static_cast<IAccessible*>(cell))->AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_nSelectedCells(long* aCellCount) { - A11Y_TRYBLOCK_BEGIN - if (!aCellCount) return E_INVALIDARG; @@ -646,15 +536,11 @@ ia2AccessibleTable::get_nSelectedCells(long* aCellCount) *aCellCount = mTable->SelectedCellCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedCells(IUnknown*** aCells, long* aNSelectedCells) { - A11Y_TRYBLOCK_BEGIN - if (!aCells || !aNSelectedCells) return E_INVALIDARG; @@ -682,15 +568,11 @@ ia2AccessibleTable::get_selectedCells(IUnknown*** aCells, long* aNSelectedCells) *aNSelectedCells = cells.Length(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedColumns(long** aColumns, long* aNColumns) { - A11Y_TRYBLOCK_BEGIN - if (!aColumns || !aNColumns) return E_INVALIDARG; @@ -712,15 +594,11 @@ ia2AccessibleTable::get_selectedColumns(long** aColumns, long* aNColumns) (*aColumns)[i] = colIndices[i]; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTable::get_selectedRows(long** aRows, long* aNRows) { - A11Y_TRYBLOCK_BEGIN - if (!aRows || !aNRows) return E_INVALIDARG; @@ -742,6 +620,4 @@ ia2AccessibleTable::get_selectedRows(long** aRows, long* aNRows) (*aRows)[i] = rowIndices[i]; return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleTableCell.cpp b/accessible/windows/ia2/ia2AccessibleTableCell.cpp index e625a7049..19cfc55da 100644 --- a/accessible/windows/ia2/ia2AccessibleTableCell.cpp +++ b/accessible/windows/ia2/ia2AccessibleTableCell.cpp @@ -46,8 +46,6 @@ ia2AccessibleTableCell::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleTableCell::get_table(IUnknown** aTable) { - A11Y_TRYBLOCK_BEGIN - if (!aTable) return E_INVALIDARG; @@ -63,15 +61,11 @@ ia2AccessibleTableCell::get_table(IUnknown** aTable) *aTable = static_cast<IAccessible*>(wrap); (*aTable)->AddRef(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_columnExtent(long* aSpan) { - A11Y_TRYBLOCK_BEGIN - if (!aSpan) return E_INVALIDARG; @@ -82,16 +76,12 @@ ia2AccessibleTableCell::get_columnExtent(long* aSpan) *aSpan = mTableCell->ColExtent(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_columnHeaderCells(IUnknown*** aCellAccessibles, long* aNColumnHeaderCells) { - A11Y_TRYBLOCK_BEGIN - if (!aCellAccessibles || !aNColumnHeaderCells) return E_INVALIDARG; @@ -118,15 +108,11 @@ ia2AccessibleTableCell::get_columnHeaderCells(IUnknown*** aCellAccessibles, } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_columnIndex(long* aColIdx) { - A11Y_TRYBLOCK_BEGIN - if (!aColIdx) return E_INVALIDARG; @@ -136,15 +122,11 @@ ia2AccessibleTableCell::get_columnIndex(long* aColIdx) *aColIdx = mTableCell->ColIdx(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_rowExtent(long* aSpan) { - A11Y_TRYBLOCK_BEGIN - if (!aSpan) return E_INVALIDARG; @@ -154,16 +136,12 @@ ia2AccessibleTableCell::get_rowExtent(long* aSpan) *aSpan = mTableCell->RowExtent(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_rowHeaderCells(IUnknown*** aCellAccessibles, long* aNRowHeaderCells) { - A11Y_TRYBLOCK_BEGIN - if (!aCellAccessibles || !aNRowHeaderCells) return E_INVALIDARG; @@ -189,15 +167,11 @@ ia2AccessibleTableCell::get_rowHeaderCells(IUnknown*** aCellAccessibles, } return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_rowIndex(long* aRowIdx) { - A11Y_TRYBLOCK_BEGIN - if (!aRowIdx) return E_INVALIDARG; @@ -207,8 +181,6 @@ ia2AccessibleTableCell::get_rowIndex(long* aRowIdx) *aRowIdx = mTableCell->RowIdx(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -217,8 +189,6 @@ ia2AccessibleTableCell::get_rowColumnExtents(long* aRowIdx, long* aColIdx, long* aColExtents, boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aRowIdx || !aColIdx || !aRowExtents || !aColExtents || !aIsSelected) return E_INVALIDARG; @@ -234,15 +204,11 @@ ia2AccessibleTableCell::get_rowColumnExtents(long* aRowIdx, long* aColIdx, *aIsSelected = mTableCell->Selected(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleTableCell::get_isSelected(boolean* aIsSelected) { - A11Y_TRYBLOCK_BEGIN - if (!aIsSelected) return E_INVALIDARG; @@ -252,6 +218,4 @@ ia2AccessibleTableCell::get_isSelected(boolean* aIsSelected) *aIsSelected = mTableCell->Selected(); return S_OK; - - A11Y_TRYBLOCK_END } diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index 7ac766f30..86b3abdf6 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -28,8 +28,6 @@ bool ia2AccessibleText::sLastTextChangeWasInsert = false; STDMETHODIMP ia2AccessibleText::addSelection(long aStartOffset, long aEndOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -38,16 +36,12 @@ ia2AccessibleText::addSelection(long aStartOffset, long aEndOffset) return textAcc->AddToSelection(aStartOffset, aEndOffset) ? S_OK : E_INVALIDARG; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_attributes(long aOffset, long *aStartOffset, long *aEndOffset, BSTR *aTextAttributes) { - A11Y_TRYBLOCK_BEGIN - if (!aStartOffset || !aEndOffset || !aTextAttributes) return E_INVALIDARG; @@ -74,15 +68,11 @@ ia2AccessibleText::get_attributes(long aOffset, long *aStartOffset, *aEndOffset = endOffset; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_caretOffset(long *aOffset) { - A11Y_TRYBLOCK_BEGIN - if (!aOffset) return E_INVALIDARG; @@ -97,8 +87,6 @@ ia2AccessibleText::get_caretOffset(long *aOffset) *aOffset = textAcc->CaretOffset(); return *aOffset != -1 ? S_OK : S_FALSE; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -107,8 +95,6 @@ ia2AccessibleText::get_characterExtents(long aOffset, long* aX, long* aY, long* aWidth, long* aHeight) { - A11Y_TRYBLOCK_BEGIN - if (!aX || !aY || !aWidth || !aHeight) return E_INVALIDARG; *aX = *aY = *aWidth = *aHeight = 0; @@ -129,15 +115,11 @@ ia2AccessibleText::get_characterExtents(long aOffset, *aWidth = rect.width; *aHeight = rect.height; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_nSelections(long* aNSelections) { - A11Y_TRYBLOCK_BEGIN - if (!aNSelections) return E_INVALIDARG; *aNSelections = 0; @@ -151,8 +133,6 @@ ia2AccessibleText::get_nSelections(long* aNSelections) *aNSelections = textAcc->SelectionCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -160,8 +140,6 @@ ia2AccessibleText::get_offsetAtPoint(long aX, long aY, enum IA2CoordinateType aCoordType, long* aOffset) { - A11Y_TRYBLOCK_BEGIN - if (!aOffset) return E_INVALIDARG; *aOffset = 0; @@ -179,16 +157,12 @@ ia2AccessibleText::get_offsetAtPoint(long aX, long aY, *aOffset = textAcc->OffsetAtPoint(aX, aY, geckoCoordType); return *aOffset == -1 ? S_FALSE : S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_selection(long aSelectionIndex, long* aStartOffset, long* aEndOffset) { - A11Y_TRYBLOCK_BEGIN - if (!aStartOffset || !aEndOffset) return E_INVALIDARG; *aStartOffset = *aEndOffset = 0; @@ -207,15 +181,11 @@ ia2AccessibleText::get_selection(long aSelectionIndex, long* aStartOffset, *aStartOffset = startOffset; *aEndOffset = endOffset; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR* aText) { - A11Y_TRYBLOCK_BEGIN - if (!aText) return E_INVALIDARG; @@ -239,8 +209,6 @@ ia2AccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR* aText) *aText = ::SysAllocStringLen(text.get(), text.Length()); return *aText ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -249,8 +217,6 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset, long* aStartOffset, long* aEndOffset, BSTR* aText) { - A11Y_TRYBLOCK_BEGIN - if (!aStartOffset || !aEndOffset || !aText) return E_INVALIDARG; @@ -287,8 +253,6 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset, *aText = ::SysAllocStringLen(text.get(), text.Length()); return *aText ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -297,8 +261,6 @@ ia2AccessibleText::get_textAfterOffset(long aOffset, long* aStartOffset, long* aEndOffset, BSTR* aText) { - A11Y_TRYBLOCK_BEGIN - if (!aStartOffset || !aEndOffset || !aText) return E_INVALIDARG; @@ -335,8 +297,6 @@ ia2AccessibleText::get_textAfterOffset(long aOffset, *aText = ::SysAllocStringLen(text.get(), text.Length()); return *aText ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -345,8 +305,6 @@ ia2AccessibleText::get_textAtOffset(long aOffset, long* aStartOffset, long* aEndOffset, BSTR* aText) { - A11Y_TRYBLOCK_BEGIN - if (!aStartOffset || !aEndOffset || !aText) return E_INVALIDARG; @@ -381,15 +339,11 @@ ia2AccessibleText::get_textAtOffset(long aOffset, *aText = ::SysAllocStringLen(text.get(), text.Length()); return *aText ? S_OK : E_OUTOFMEMORY; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::removeSelection(long aSelectionIndex) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -398,15 +352,11 @@ ia2AccessibleText::removeSelection(long aSelectionIndex) return textAcc->RemoveFromSelection(aSelectionIndex) ? S_OK : E_INVALIDARG; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::setCaretOffset(long aOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -418,16 +368,12 @@ ia2AccessibleText::setCaretOffset(long aOffset) textAcc->SetCaretOffset(aOffset); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::setSelection(long aSelectionIndex, long aStartOffset, long aEndOffset) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -436,15 +382,11 @@ ia2AccessibleText::setSelection(long aSelectionIndex, long aStartOffset, return textAcc->SetSelectionBoundsAt(aSelectionIndex, aStartOffset, aEndOffset) ? S_OK : E_INVALIDARG; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_nCharacters(long* aNCharacters) { - A11Y_TRYBLOCK_BEGIN - if (!aNCharacters) return E_INVALIDARG; *aNCharacters = 0; @@ -457,16 +399,12 @@ ia2AccessibleText::get_nCharacters(long* aNCharacters) *aNCharacters = textAcc->CharacterCount(); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex, enum IA2ScrollType aScrollType) { - A11Y_TRYBLOCK_BEGIN - MOZ_ASSERT(!HyperTextProxyFor(this)); HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this); @@ -478,8 +416,6 @@ ia2AccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex, textAcc->ScrollSubstringTo(aStartIndex, aEndIndex, aScrollType); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP @@ -487,8 +423,6 @@ ia2AccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex, enum IA2CoordinateType aCoordType, long aX, long aY) { - A11Y_TRYBLOCK_BEGIN - uint32_t geckoCoordType = (aCoordType == IA2_COORDTYPE_SCREEN_RELATIVE) ? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE : nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE; @@ -505,28 +439,18 @@ ia2AccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex, textAcc->ScrollSubstringToPoint(aStartIndex, aEndIndex, geckoCoordType, aX, aY); return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_newText(IA2TextSegment *aNewText) { - A11Y_TRYBLOCK_BEGIN - return GetModifiedText(true, aNewText); - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleText::get_oldText(IA2TextSegment *aOldText) { - A11Y_TRYBLOCK_BEGIN - return GetModifiedText(false, aOldText); - - A11Y_TRYBLOCK_END } // ia2AccessibleText diff --git a/accessible/windows/ia2/ia2AccessibleValue.cpp b/accessible/windows/ia2/ia2AccessibleValue.cpp index e33442295..44d2c31fb 100644 --- a/accessible/windows/ia2/ia2AccessibleValue.cpp +++ b/accessible/windows/ia2/ia2AccessibleValue.cpp @@ -46,8 +46,6 @@ ia2AccessibleValue::QueryInterface(REFIID iid, void** ppv) STDMETHODIMP ia2AccessibleValue::get_currentValue(VARIANT* aCurrentValue) { - A11Y_TRYBLOCK_BEGIN - if (!aCurrentValue) return E_INVALIDARG; @@ -68,15 +66,11 @@ ia2AccessibleValue::get_currentValue(VARIANT* aCurrentValue) aCurrentValue->vt = VT_R8; aCurrentValue->dblVal = currentValue; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleValue::setCurrentValue(VARIANT aValue) { - A11Y_TRYBLOCK_BEGIN - if (aValue.vt != VT_R8) return E_INVALIDARG; @@ -87,15 +81,11 @@ ia2AccessibleValue::setCurrentValue(VARIANT aValue) return CO_E_OBJNOTCONNECTED; return valueAcc->SetCurValue(aValue.dblVal) ? S_OK : E_FAIL; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleValue::get_maximumValue(VARIANT* aMaximumValue) { - A11Y_TRYBLOCK_BEGIN - if (!aMaximumValue) return E_INVALIDARG; @@ -116,15 +106,11 @@ ia2AccessibleValue::get_maximumValue(VARIANT* aMaximumValue) aMaximumValue->vt = VT_R8; aMaximumValue->dblVal = maximumValue; return S_OK; - - A11Y_TRYBLOCK_END } STDMETHODIMP ia2AccessibleValue::get_minimumValue(VARIANT* aMinimumValue) { - A11Y_TRYBLOCK_BEGIN - if (!aMinimumValue) return E_INVALIDARG; @@ -145,7 +131,5 @@ ia2AccessibleValue::get_minimumValue(VARIANT* aMinimumValue) aMinimumValue->vt = VT_R8; aMinimumValue->dblVal = minimumValue; return S_OK; - - A11Y_TRYBLOCK_END } |