diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 13:46:04 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 13:46:04 +0100 |
commit | 616475a0c1109460fe42045ca3380f4d8f0752cd (patch) | |
tree | f28d81584e97fa7b988cef20969cc6046a00c62a /accessible/windows/ia2/ia2AccessibleAction.cpp | |
parent | a14048f0a23b0e50576ab3b5e87aebd616b35d43 (diff) | |
download | UXP-616475a0c1109460fe42045ca3380f4d8f0752cd.tar UXP-616475a0c1109460fe42045ca3380f4d8f0752cd.tar.gz UXP-616475a0c1109460fe42045ca3380f4d8f0752cd.tar.lz UXP-616475a0c1109460fe42045ca3380f4d8f0752cd.tar.xz UXP-616475a0c1109460fe42045ca3380f4d8f0752cd.zip |
Remove SEH try blocks from a11y code.
Diffstat (limited to 'accessible/windows/ia2/ia2AccessibleAction.cpp')
-rw-r--r-- | accessible/windows/ia2/ia2AccessibleAction.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
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 } |