1 files changed, 21 insertions, 21 deletions

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 98cb27322aee..01adba1a2b80 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -147,7 +147,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
         bLeave = ((nX < 0) || (nY < 0) ||
                   (nX >= mpWindowImpl->mpFrameWindow->mnOutWidth) ||
                   (nY >= mpWindowImpl->mpFrameWindow->mnOutHeight)) &&
-                 !ImplGetSVData()->maWinData.mpCaptureWin;
+                 !ImplGetSVData()->mpWinData->mpCaptureWin;
         nMode |= MouseEventModifiers::SYNTHETIC;
         if ( bModChanged )
             nMode |= MouseEventModifiers::MODIFIERCHANGED;
@@ -165,7 +165,7 @@ void Window::ImplGenerateMouseMove()
 IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl, void*, void)
 {
     mpWindowImpl->mpFrameData->mnMouseMoveId = nullptr;
-    vcl::Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin;
+    vcl::Window* pCaptureWin = ImplGetSVData()->mpWinData->mpCaptureWin;
     if( ! pCaptureWin ||
         (pCaptureWin->mpWindowImpl && pCaptureWin->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame)
     )
@@ -252,7 +252,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
     ImplSVData* pSVData = ImplGetSVData();
 
     bool bAsyncFocusWaiting = false;
-    vcl::Window *pFrame = pSVData->maWinData.mpFirstFrame;
+    vcl::Window *pFrame = pSVData->maFrameData.mpFirstFrame;
     while( pFrame  )
     {
         if( pFrame != mpWindowImpl->mpFrameWindow.get() && pFrame->mpWindowImpl->mpFrameData->mnFocusId )
@@ -279,15 +279,15 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
         pParent = pParent->mpWindowImpl->mpParent;
     }
 
-    if ( !(( pSVData->maWinData.mpFocusWin.get() != this &&
+    if ( !(( pSVData->mpWinData->mpFocusWin.get() != this &&
              !mpWindowImpl->mbInDispose ) ||
            ( bAsyncFocusWaiting && !bHasFocus && !bMustNotGrabFocus )) )
         return;
 
     // EndExtTextInput if it is not the same window
-    if ( pSVData->maWinData.mpExtTextInputWin &&
-         (pSVData->maWinData.mpExtTextInputWin.get() != this) )
-        pSVData->maWinData.mpExtTextInputWin->EndExtTextInput();
+    if (pSVData->mpWinData->mpExtTextInputWin
+        && (pSVData->mpWinData->mpExtTextInputWin.get() != this))
+        pSVData->mpWinData->mpExtTextInputWin->EndExtTextInput();
 
     // mark this windows as the last FocusWindow
     vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow();
@@ -309,9 +309,9 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
         }
     }
 
-    VclPtr<vcl::Window> pOldFocusWindow = pSVData->maWinData.mpFocusWin;
+    VclPtr<vcl::Window> pOldFocusWindow = pSVData->mpWinData->mpFocusWin;
 
-    pSVData->maWinData.mpFocusWin = this;
+    pSVData->mpWinData->mpFocusWin = this;
 
     if ( pOldFocusWindow )
     {
@@ -346,16 +346,16 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
     // call Get- and LoseFocus
     if ( pOldFocusWindow && ! pOldFocusWindow->IsDisposed() )
     {
-        if ( pOldFocusWindow->IsTracking() &&
-             (pSVData->maWinData.mnTrackFlags & StartTrackingFlags::FocusCancel) )
-            pOldFocusWindow->EndTracking( TrackingEventFlags::Cancel | TrackingEventFlags::Focus );
+        if (pOldFocusWindow->IsTracking()
+            && (pSVData->mpWinData->mnTrackFlags & StartTrackingFlags::FocusCancel))
+            pOldFocusWindow->EndTracking(TrackingEventFlags::Cancel | TrackingEventFlags::Focus);
         NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, pOldFocusWindow );
         if ( !ImplCallPreNotify( aNEvt ) )
             pOldFocusWindow->CompatLoseFocus();
         pOldFocusWindow->ImplCallDeactivateListeners( this );
     }
 
-    if ( pSVData->maWinData.mpFocusWin.get() == this )
+    if (pSVData->mpWinData->mpFocusWin.get() == this)
     {
         if ( mpWindowImpl->mpSysObj )
         {
@@ -364,7 +364,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
                 mpWindowImpl->mpSysObj->GrabFocus();
         }
 
-        if ( pSVData->maWinData.mpFocusWin.get() == this )
+        if (pSVData->mpWinData->mpFocusWin.get() == this)
         {
             if ( mpWindowImpl->mpCursor )
                 mpWindowImpl->mpCursor->ImplShow();
@@ -446,15 +446,15 @@ void Window::CaptureMouse()
     ImplSVData* pSVData = ImplGetSVData();
 
     // possibly stop tracking
-    if ( pSVData->maWinData.mpTrackWin.get() != this )
+    if (pSVData->mpWinData->mpTrackWin.get() != this)
     {
-        if ( pSVData->maWinData.mpTrackWin )
-            pSVData->maWinData.mpTrackWin->EndTracking( TrackingEventFlags::Cancel );
+        if (pSVData->mpWinData->mpTrackWin)
+            pSVData->mpWinData->mpTrackWin->EndTracking(TrackingEventFlags::Cancel);
     }
 
-    if ( pSVData->maWinData.mpCaptureWin.get() != this )
+    if (pSVData->mpWinData->mpCaptureWin.get() != this)
     {
-        pSVData->maWinData.mpCaptureWin = this;
+        pSVData->mpWinData->mpCaptureWin = this;
         mpWindowImpl->mpFrame->CaptureMouse( true );
     }
 }
@@ -464,7 +464,7 @@ void Window::ReleaseMouse()
     if (IsMouseCaptured())
     {
         ImplSVData* pSVData = ImplGetSVData();
-        pSVData->maWinData.mpCaptureWin = nullptr;
+        pSVData->mpWinData->mpCaptureWin = nullptr;
         mpWindowImpl->mpFrame->CaptureMouse( false );
         ImplGenerateMouseMove();
     }
@@ -472,7 +472,7 @@ void Window::ReleaseMouse()
 
 bool Window::IsMouseCaptured() const
 {
-    return (this == ImplGetSVData()->maWinData.mpCaptureWin);
+    return (this == ImplGetSVData()->mpWinData->mpCaptureWin);
 }
 
 void Window::SetPointer( const Pointer& rPointer )