1 files changed, 14 insertions, 17 deletions

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 03258c9fdaf2..652e6b5a244f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -76,9 +76,9 @@ using namespace ::com::sun::star;
 
 //  Corner-Button
 
-ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData ) :
+ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData& rData ) :
     Window( pParent, WinBits( 0 ) ),
-    pViewData( pData )
+    rViewData( rData )
 {
     ScCornerButton::EnableRTL( false );
     SetQuickHelpText(ScResId(SCSTR_QHELP_SELECT_ALL_CELLS));
@@ -99,7 +99,7 @@ void ScCornerButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
 
     Window::Paint(rRenderContext, rRect);
 
-    bool bLayoutRTL = pViewData->GetDocument().IsLayoutRTL( pViewData->GetTabNo() );
+    bool bLayoutRTL = rViewData.GetDocument().IsLayoutRTL( rViewData.GetTabNo() );
     tools::Long nDarkX = bLayoutRTL ? 0 : nPosX;
 
     //  both buttons have the same look now - only dark right/bottom lines
@@ -137,7 +137,7 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt )
     bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
     if (!bDisable)
     {
-        ScTabViewShell* pViewSh = pViewData->GetViewShell();
+        ScTabViewShell* pViewSh = rViewData.GetViewShell();
         pViewSh->SetActive();                                   // Appear and SetViewFrame
         pViewSh->ActiveGrabFocus();
 
@@ -177,14 +177,14 @@ bool lcl_HasRowOutline( const ScViewData& rViewData )
 ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
     pFrameWin( pParent ),
     aViewData( rDocSh, pViewShell ),
-    aFunctionSet( &aViewData ),
-    aHdrFunc( &aViewData ),
+    aFunctionSet( aViewData ),
+    aHdrFunc( aViewData ),
     aVScrollTop( VclPtr<ScrollAdaptor>::Create( pFrameWin, false ) ),
     aVScrollBottom( VclPtr<ScrollAdaptor>::Create( pFrameWin, false ) ),
     aHScrollLeft( VclPtr<ScrollAdaptor>::Create( pFrameWin, true ) ),
     aHScrollRight( VclPtr<ScrollAdaptor>::Create( pFrameWin, true ) ),
-    aCornerButton( VclPtr<ScCornerButton>::Create( pFrameWin, &aViewData ) ),
-    aTopButton( VclPtr<ScCornerButton>::Create( pFrameWin, &aViewData ) ),
+    aCornerButton( VclPtr<ScCornerButton>::Create( pFrameWin, aViewData ) ),
+    aTopButton( VclPtr<ScCornerButton>::Create( pFrameWin, aViewData ) ),
     aScrollTimer("ScTabView aScrollTimer"),
     pTimerWindow( nullptr ),
     aExtraEditViewManager( pViewShell, pGridWin ),
@@ -1657,14 +1657,14 @@ void ScTabView::UpdateShow()
     }
 
     if (bHOutline && !pColOutline[SC_SPLIT_LEFT])
-        pColOutline[SC_SPLIT_LEFT] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_HOR, &aViewData, SC_SPLIT_BOTTOMLEFT );
+        pColOutline[SC_SPLIT_LEFT] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_HOR, aViewData, SC_SPLIT_BOTTOMLEFT );
     if (bShowH && bHOutline && !pColOutline[SC_SPLIT_RIGHT])
-        pColOutline[SC_SPLIT_RIGHT] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_HOR, &aViewData, SC_SPLIT_BOTTOMRIGHT );
+        pColOutline[SC_SPLIT_RIGHT] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_HOR, aViewData, SC_SPLIT_BOTTOMRIGHT );
 
     if (bVOutline && !pRowOutline[SC_SPLIT_BOTTOM])
-        pRowOutline[SC_SPLIT_BOTTOM] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_VER, &aViewData, SC_SPLIT_BOTTOMLEFT );
+        pRowOutline[SC_SPLIT_BOTTOM] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_VER, aViewData, SC_SPLIT_BOTTOMLEFT );
     if (bShowV && bVOutline && !pRowOutline[SC_SPLIT_TOP])
-        pRowOutline[SC_SPLIT_TOP] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_VER, &aViewData, SC_SPLIT_TOPLEFT );
+        pRowOutline[SC_SPLIT_TOP] = VclPtr<ScOutlineWindow>::Create( pFrameWin, SC_OUTLINE_VER, aViewData, SC_SPLIT_TOPLEFT );
 
     if (bShowH && bHeader && !pColBar[SC_SPLIT_RIGHT])
         pColBar[SC_SPLIT_RIGHT] = VclPtr<ScColBar>::Create( pFrameWin, SC_SPLIT_RIGHT,
@@ -2384,7 +2384,6 @@ void ScTabView::SetNewVisArea()
     for (i=0; i<4; i++)
         if (pGridWin[i] && aDrawMode[i] != aOldMode[i])
         {
-            pGridWin[i]->flushOverlayManager();     // #i79909# flush overlays before switching to edit MapMode
             pGridWin[i]->SetMapMode(aOldMode[i]);
         }
 
@@ -2409,8 +2408,6 @@ void ScTabView::SetNewVisArea()
 
         ScGridWindow *pGridWindow = GetViewData().GetActiveWin();
         pGridWindow->DrawEditView(*pGridWindow->GetOutDev(), pEditView);
-
-        pGridWindow->flushOverlayManager();
         pGridWindow->GetOutDev()->SetMapMode(GetViewData().GetLogicMode());
 
         if (bInPlaceVisCursor)
@@ -2546,14 +2543,14 @@ void ScTabView::ResetAutoSpellForContentChange()
     }
 }
 
-void ScTabView::SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const std::vector<editeng::MisspellRanges>* pRanges )
+void ScTabView::SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const sc::MisspellRangeResult& rRangeResult )
 {
     for (VclPtr<ScGridWindow> & pWin: pGridWin)
     {
         if (!pWin)
             continue;
 
-        pWin->SetAutoSpellData(nPosX, nPosY, pRanges);
+        pWin->SetAutoSpellData(nPosX, nPosY, rRangeResult);
     }
 }