ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

wina11y: Drop unnecessary exception handling

Browse Source 
Window::GetSystemData should never throw an
exception, so there's no need for exception
handling here. Also, return early if the
system data is null.

Change-Id: I65794f10019d0c2fb5cc7150500b551c31cc2a08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177887
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2024-12-05 20:12:21 +01:00
parent c82a5669bc
commit f40a68f58d
1 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
winaccessibility/source/service/AccTopWindowListener.cxx
+24 -32
View File
@@ -47,45 +47,37 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible*
else if (auto pvclxcomponent = dynamic_cast<VCLXAccessibleComponent*>(pAccessible))
window = pvclxcomponent->GetWindow();
assert(window);
// The SalFrame of window may be destructed at this time
const SystemEnvData* systemdata = nullptr;
try
{
systemdata = window->GetSystemData();
}
catch(...)
{
systemdata = nullptr;
}
const SystemEnvData* pSystemData = window->GetSystemData();
if (!pSystemData)
return;
Reference<css::accessibility::XAccessibleContext> xContext = pAccessible->getAccessibleContext();
if(!xContext.is())
return;
// add all listeners
if (systemdata != nullptr)
m_aAccObjectManager.SaveTopWindowHandle(pSystemData->hWnd, pAccessible);
AddAllListeners(pAccessible, nullptr, pSystemData->hWnd);
if( window->GetStyle() & WB_MOVEABLE )
m_aAccObjectManager.IncreaseState( pAccessible, static_cast<unsigned short>(-1) /* U_MOVEBLE */ );
short role = xContext->getAccessibleRole();
if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == css::accessibility::AccessibleRole::MENU )
{
m_aAccObjectManager.SaveTopWindowHandle(systemdata->hWnd, pAccessible);
m_aAccObjectManager.NotifyAccEvent(pAccessible, UnoMSAAEvent::MENUPOPUPSTART);
}
AddAllListeners(pAccessible,nullptr,systemdata->hWnd);
if( window->GetStyle() & WB_MOVEABLE )
m_aAccObjectManager.IncreaseState( pAccessible, static_cast<unsigned short>(-1) /* U_MOVEBLE */ );
short role = xContext->getAccessibleRole();
if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == css::accessibility::AccessibleRole::MENU )
{
m_aAccObjectManager.NotifyAccEvent(pAccessible, UnoMSAAEvent::MENUPOPUPSTART);
}
if (role == css::accessibility::AccessibleRole::FRAME ||
role == css::accessibility::AccessibleRole::DIALOG ||
role == css::accessibility::AccessibleRole::WINDOW ||
role == css::accessibility::AccessibleRole::ALERT)
{
m_aAccObjectManager.NotifyAccEvent(pAccessible, UnoMSAAEvent::SHOW);
}
if (role == css::accessibility::AccessibleRole::FRAME ||
role == css::accessibility::AccessibleRole::DIALOG ||
role == css::accessibility::AccessibleRole::WINDOW ||
role == css::accessibility::AccessibleRole::ALERT)
{
m_aAccObjectManager.NotifyAccEvent(pAccessible, UnoMSAAEvent::SHOW);
}
}