diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-09 10:08:14 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-09 15:45:35 +0200 |
| commit | 63a004f51f063cad68c007d79d5cd4f56adde96b (patch) | |
| tree | 1f750bd25c5101ec1a8068d8bb1b7cd07c45d5a4 /winaccessibility/source/UAccCOM/AccTable.cxx | |
| parent | d2c1a4fa508572cc2908787deeebc5baa9d6e0c3 (diff) | |
wina11y: Use return value instead of out param
... to return the `IAccessible*` in
`AccObjectWinManager::GetIAccessibleFromXAccessible` and
`CMAccessible::get_IAccessibleFromXAccessible` and adapt
the call sites accordingly.
This is more straight-forward and the extra bool return
value didn't add anything, since it was also just
saying whether the pointer was a nullptr, so rather
check that directly.
Also drop `AccObjectWinManager::GetIMAccByXAcc` that
does the same thing and switch the only call site
to use `AccObjectWinManager::GetIAccessibleFromXAccessible`
instead.
Change-Id: I72933df62aa9ac1ff3f2a84c5045dfae354c18e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155505
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccTable.cxx')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccTable.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index 6cb0dd1d26b2..9fd32c532bc5 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -64,10 +64,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col return E_FAIL; } - IAccessible* pRet = nullptr; - - bool isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); - if(isTRUE) + IAccessible* pRet = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get()); + if (pRet) { *accessible = pRet; pRet->AddRef(); @@ -78,9 +76,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col Reference<XAccessible> pxTable(pRXTable, UNO_QUERY); CMAccessible::g_pAccObjectManager->InsertAccObj(pRAcc.get(),pxTable.get()); - isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); + pRet = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get()); - if(isTRUE) + if (pRet) { *accessible = pRet; pRet->AddRef(); @@ -549,8 +547,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible Reference<XAccessible> pRAcc = pRXTable->getAccessibleSummary(); - IAccessible* pRet = nullptr; - CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); + IAccessible* pRet = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get()); if(pRet) { @@ -1099,17 +1096,16 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedCells(IUnknown * * * ce Reference<XAccessible> xAcc = xSelection->getSelectedAccessibleChild(i); assert(xAcc.is()); - IAccessible* pIAccessible; - bool bOK = CMAccessible::get_IAccessibleFromXAccessible(xAcc.get(), &pIAccessible); + IAccessible* pIAccessible = CMAccessible::get_IAccessibleFromXAccessible(xAcc.get()); - if (!bOK) + if (!pIAccessible) { Reference<XAccessible> xTable(pRXTable, UNO_QUERY); CMAccessible::g_pAccObjectManager->InsertAccObj(xAcc.get(), xTable.get()); - bOK = CMAccessible::get_IAccessibleFromXAccessible(xAcc.get(), &pIAccessible); + pIAccessible = CMAccessible::get_IAccessibleFromXAccessible(xAcc.get()); } - assert(bOK && "Couldn't retrieve IAccessible object"); + assert(pIAccessible && "Couldn't retrieve IAccessible object"); pIAccessible->AddRef(); (*cells)[i] = pIAccessible; |