winaccessibility/source/service/AccObjectWinManager.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit 5b9f867b91fdb7b9c1fa2c0d01ad6fe68180f867 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Apr 3 15:37:07 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Apr 3 19:27:22 2025 +0200 wina11y: Clean up listener creation a bit * AccObjectWinManager::CreateAccEventListener always returns non-empty reference, so replace if check by assert. * Use "x" prefix for rtl::Reference. * No need to explicitly have a uno::Reference<XAccessibleEventListener>, just pass the rtl::Reference. Change-Id: I0c45f70670a21dbd879c3e4c8c093f155722155a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183682 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 7b9b8821134a..918a6fa47155 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -651,15 +651,13 @@ bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentX } //end of file name - ::rtl::Reference<AccEventListener> const pListener = - CreateAccEventListener(pXAcc); - if (!pListener.is()) - return false; + rtl::Reference<AccEventListener> const xListener = CreateAccEventListener(pXAcc); + assert(xListener.is()); + Reference<XAccessibleComponent> xComponent(xContext, UNO_QUERY); Reference<XAccessibleEventBroadcaster> broadcaster(xComponent,UNO_QUERY); if (broadcaster.is()) { - Reference<XAccessibleEventListener> const xListener(pListener); broadcaster->addAccessibleEventListener(xListener); } else @@ -676,7 +674,7 @@ bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentX AccObject* pCurObj = GetAccObjByXAcc(pXAcc); if( pCurObj ) { - pCurObj->SetListener(pListener); + pCurObj->SetListener(xListener); } AccObject* pParentObj = GetAccObjByXAcc(pParentXAcc);
