From d492d1bfeb484ab8b627948449f488b2738946aa Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 16 Apr 2020 20:03:35 +0300 Subject: VCLXAccessibleComponent* may be passed to HandleWindowOpened my_sc_impl::AccessBridgeHandleExistingWindow may do that for combobox floating window; then using the pointer statically cast to VCLXWindow* will crash. Change-Id: Ib4c47715a5fa059aa81f33137cc3d10851a728e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92387 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- winaccessibility/source/service/AccTopWindowListener.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index 9a3071086324..76aee9ae8333 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -53,8 +54,12 @@ using namespace cppu; void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* pAccessible ) { //get SystemData from window - VCLXWindow* pvclwindow = static_cast(pAccessible); - auto window = pvclwindow->GetWindow(); + VclPtr window; + if (auto pvclwindow = dynamic_cast(pAccessible)) + window = pvclwindow->GetWindow(); + else if (auto pvclxcomponent = dynamic_cast(pAccessible)) + window = pvclxcomponent->GetWindow(); + assert(window); // The SalFrame of window may be destructed at this time const SystemEnvData* systemdata = nullptr; try -- cgit