3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 81ae3c778551..c05d098dcf21 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1715,7 +1715,7 @@ Point ScTabView::GetChartInsertPos( const Size& rSize, const ScRange& rCellRange
     if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
         eUsedPart = (WhichH(eUsedPart)==SC_SPLIT_LEFT) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT;
 
-    ScGridWindow* pWin = pGridWin[eUsedPart];
+    ScGridWindow* pWin = pGridWin[eUsedPart].get();
     OSL_ENSURE( pWin, "Window not found" );
     if (pWin)
     {
@@ -1832,7 +1832,7 @@ Point ScTabView::GetChartDialogPos( const Size& rDialogSize, const Rectangle& rL
     if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
         eUsedPart = (WhichH(eUsedPart)==SC_SPLIT_LEFT) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT;
 
-    ScGridWindow* pWin = pGridWin[eUsedPart];
+    ScGridWindow* pWin = pGridWin[eUsedPart].get();
     OSL_ENSURE( pWin, "Window not found" );
     if (pWin)
     {
@@ -2181,7 +2181,7 @@ void ScTabView::SetNewVisArea()
 
 bool ScTabView::HasPageFieldDataAtCursor() const
 {
-    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
+    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get();
     SCCOL nCol = aViewData.GetCurX();
     SCROW nRow = aViewData.GetCurY();
     if (pWin)
@@ -2192,7 +2192,7 @@ bool ScTabView::HasPageFieldDataAtCursor() const
 
 void ScTabView::StartDataSelect()
 {
-    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
+    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get();
     SCCOL nCol = aViewData.GetCurX();
     SCROW nRow = aViewData.GetCurY();
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 7dce8524fec7..fb3d6b47ee50 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -717,7 +717,7 @@ void ScTabView::TestHintWindow()
         if ( pData && pData->GetInput( aTitle, aMessage ) && !aMessage.isEmpty() )
         {
             ScSplitPos eWhich = aViewData.GetActivePart();
-            ScGridWindow* pWin = pGridWin[eWhich];
+            ScGridWindow* pWin = pGridWin[eWhich].get();
             SCCOL nCol = aViewData.GetCurX();
             SCROW nRow = aViewData.GetCurY();
             Point aPos = aViewData.GetScrPos( nCol, nRow, eWhich );
@@ -2112,7 +2112,7 @@ void ScTabView::KillEditView( bool bNoPaint )
                     auto lInvalidateWindows =
                             [&rInvRect] (ScTabView* pTabView)
                             {
-                                for (ScGridWindow* pWin: pTabView->pGridWin)
+                                for (VclPtr<ScGridWindow> const & pWin: pTabView->pGridWin)
                                 {
                                     if (pWin)
                                         pWin->Invalidate(rInvRect);
@@ -2808,7 +2808,7 @@ void ScTabView::HideListBox()
 
 void ScTabView::UpdateInputContext()
 {
-    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
+    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get();
     if (pWin)
         pWin->UpdateInputContext();
 
@@ -2879,7 +2879,7 @@ void ScTabView::ZoomChanged()
     HideNoteMarker();
 
     // AW: To not change too much, use pWin here
-    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
+    ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get();
 
     if ( pWin && aViewData.HasEditView( aViewData.GetActivePart() ) )
     {
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index fbb40fa31e5a..fdc633dfaa2e 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -442,7 +442,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
     for (sal_uInt16 i=0; i<4; i++)
         if (WhichV((ScSplitPos)i)==eWhich)
         {
-            ScGridWindow* pWin = pGridWin[i];
+            ScGridWindow* pWin = pGridWin[i].get();
             if (pWin)
             {
                 Rectangle aRect( 0,nDragPos, pWin->GetOutputSizePixel().Width()-1,nDragPos+HDR_SLIDERSIZE-1 );
@@ -457,7 +457,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos )
     for (sal_uInt16 i=0; i<4; i++)
         if (WhichH((ScSplitPos)i)==eWhich)
         {
-            ScGridWindow* pWin = pGridWin[i];
+            ScGridWindow* pWin = pGridWin[i].get();
             if (pWin)
             {
                 Rectangle aRect( nDragPos,0, nDragPos+HDR_SLIDERSIZE-1,pWin->GetOutputSizePixel().Height()-1 );