diff options
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccRelation.cxx')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccRelation.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index ea779ce13f2c..543a5b1aebe6 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -48,7 +48,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_relationType(BSTR * relation { SolarMutexGuard g; - ENTER_PROTECTED_BLOCK + try { if (relationType == nullptr) return E_INVALIDARG; @@ -59,7 +59,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_relationType(BSTR * relation *relationType = getRelationTypeBSTR(type); return S_OK; - LEAVE_PROTECTED_BLOCK + } catch(...) { return E_FAIL; } } // Gets what the type of localized relation is. @@ -67,11 +67,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_localizedRelationType(BSTR * { - ENTER_PROTECTED_BLOCK + try { return S_OK; - LEAVE_PROTECTED_BLOCK + } catch(...) { return E_FAIL; } } /** @@ -83,7 +83,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_nTargets(long * nTargets) { SolarMutexGuard g; - ENTER_PROTECTED_BLOCK + try { if (nTargets == nullptr) return E_INVALIDARG; @@ -92,7 +92,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_nTargets(long * nTargets) *nTargets = xTargets.getLength(); return S_OK; - LEAVE_PROTECTED_BLOCK + } catch(...) { return E_FAIL; } } /** @@ -105,7 +105,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_target(long targetIndex, IUn { SolarMutexGuard g; - ENTER_PROTECTED_BLOCK + try { if (target == nullptr) return E_FAIL; @@ -128,7 +128,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_target(long targetIndex, IUn return E_FAIL; - LEAVE_PROTECTED_BLOCK + } catch(...) { return E_FAIL; } } /** @@ -142,7 +142,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_targets(long, IUnknown * * t { SolarMutexGuard g; - ENTER_PROTECTED_BLOCK + try { // #CHECK# if(target == nullptr) @@ -172,7 +172,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_targets(long, IUnknown * * t *nTargets = nCount; return S_OK; - LEAVE_PROTECTED_BLOCK + } catch(...) { return E_FAIL; } } /** |