2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 432a6af86b18..fa829f5eb9ce 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -260,12 +260,12 @@ UITestLogger& UITestLogger::getInstance()
     ImplSVData *const pSVData = ImplGetSVData();
     assert(pSVData);
 
-    if (!pSVData->maWinData.m_pUITestLogger)
+    if (!pSVData->maFrameData.m_pUITestLogger)
     {
-        pSVData->maWinData.m_pUITestLogger.reset(new UITestLogger);
+        pSVData->maFrameData.m_pUITestLogger.reset(new UITestLogger);
     }
 
-    return *pSVData->maWinData.m_pUITestLogger;
+    return *pSVData->maFrameData.m_pUITestLogger;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index bf1f69bfe54b..7ee417c251c5 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -55,20 +55,20 @@ bool UITest::executeDialog(const OUString& rCommand)
 std::unique_ptr<UIObject> UITest::getFocusTopWindow()
 {
     ImplSVData* pSVData = ImplGetSVData();
-    ImplSVWinData& rWinData = pSVData->maWinData;
+    ImplSVWinData& rWinData = *pSVData->mpWinData;
 
     if (!rWinData.mpExecuteDialogs.empty())
     {
         return rWinData.mpExecuteDialogs.back()->GetUITestFactory()(rWinData.mpExecuteDialogs.back());
     }
 
-    return rWinData.mpFirstFrame->GetUITestFactory()(rWinData.mpFirstFrame);
+    return pSVData->maFrameData.mpFirstFrame->GetUITestFactory()(pSVData->maFrameData.mpFirstFrame);
 }
 
 std::unique_ptr<UIObject> UITest::getFloatWindow()
 {
     ImplSVData* pSVData = ImplGetSVData();
-    ImplSVWinData& rWinData = pSVData->maWinData;
+    ImplSVWinData& rWinData = *pSVData->mpWinData;
 
     VclPtr<vcl::Window> pFloatWin = rWinData.mpFirstFloat;
     if (pFloatWin)