1 files changed, 8 insertions, 9 deletions

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 139d77149e1e..ce4edf81670b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -243,7 +243,7 @@ static bool ImplCallCommand( vcl::Window* pChild, sal_uInt16 nEvt, void* pData =
 
 struct ContextMenuEvent
 {
-    vcl::Window*         pWindow;
+    VclPtr<vcl::Window>  pWindow;
     ImplDelData     aDelData;
     Point           aChildPos;
 };
@@ -377,13 +377,13 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
 
         // no mouse messages to disabled windows
         // #106845# if the window was disabed during capturing we have to pass the mouse events to release capturing
-        if ( pSVData->maWinData.mpCaptureWin != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) )
+        if ( pSVData->maWinData.mpCaptureWin.get() != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) )
         {
             ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave );
             if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE )
             {
                 ImplHandleMouseHelpRequest( pChild, aMousePos );
-                if( pWinFrameData->mpMouseMoveWin != pChild )
+                if( pWinFrameData->mpMouseMoveWin.get() != pChild )
                     nMode |= MouseEventModifiers::ENTERWINDOW;
             }
 
@@ -1371,11 +1371,10 @@ class HandleGestureEventBase
 {
 protected:
     ImplSVData* m_pSVData;
-    vcl::Window *m_pWindow;
+    VclPtr<vcl::Window> m_pWindow;
     Point m_aMousePos;
 
 public:
-
     HandleGestureEventBase(vcl::Window *pWindow, const Point &rMousePos)
         : m_pSVData(ImplGetSVData())
         , m_pWindow(pWindow)
@@ -1692,7 +1691,7 @@ void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
                     {
                         // #i42750# presentation wants to be informed about resize
                         // as early as possible
-                        WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow);
+                        WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow.get());
                         if( ! pWorkWindow || pWorkWindow->IsPresentationMode() )
                             bStartTimer = false;
                     }
@@ -1938,7 +1937,7 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow )
 
 struct DelayedCloseEvent
 {
-    vcl::Window*         pWindow;
+    VclPtr<vcl::Window> pWindow;
     ImplDelData     aDelData;
 };
 
@@ -1951,9 +1950,9 @@ static sal_IntPtr DelayedCloseEventLink( void* pCEvent, void* )
         pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
         // dispatch to correct window type
         if( pEv->pWindow->IsSystemWindow() )
-            static_cast<SystemWindow*>(pEv->pWindow)->Close();
+            static_cast<SystemWindow*>(pEv->pWindow.get())->Close();
         else if( pEv->pWindow->IsDockingWindow() )
-            static_cast<DockingWindow*>(pEv->pWindow)->Close();
+            static_cast<DockingWindow*>(pEv->pWindow.get())->Close();
     }
     delete pEv;