2 files changed, 3 insertions, 3 deletions
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 86e997a5be02..0dbb45130ff4 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -88,8 +88,8 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 
             VCLXWindow* pvclwindow =
                 dynamic_cast<VCLXWindow*>(m_xAccessible.get());
-            vcl::Window* window = pvclwindow->GetWindow();
-            const SystemEnvData* systemdata=window->GetSystemData();
+            const SystemEnvData* systemdata
+                = pvclwindow->GetWindow()->GetSystemData();
 
             //add this child
             pAgent->InsertAccObj(pAcc, m_xAccessible.get(),
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index ee78e2f7f8ec..9fda3ed1732a 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -52,7 +52,7 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible*
 {
     //get SystemData from window
     VCLXWindow* pvclwindow = static_cast<VCLXWindow*>(pAccessible);
-    vcl::Window* window = pvclwindow->GetWindow();
+    auto window = pvclwindow->GetWindow();
     // The SalFrame of window may be destructed at this time
     const SystemEnvData* systemdata = nullptr;
     try