UpdateOle never called with a null ScViewData*

Change-Id: I5b2bdc633207ae0686e3bf30794b141c474f3f19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103420
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 58 insertions, 60 deletions

diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index ebb1d8b06390..68f04630de29 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -44,12 +44,12 @@ const sal_Int64 DIGITS      = 4;
 
 ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    weld::Window* pParent, ScViewData* pViewData)
+                    weld::Window* pParent, ScViewData& rViewData)
     : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
                           "modules/scalc/ui/randomnumbergenerator.ui",
                           "RandomNumberGeneratorDialog")
-    , mpViewData(pViewData)
-    , mrDoc(pViewData->GetDocument())
+    , mrViewData(rViewData)
+    , mrDoc(rViewData.GetDocument())
     , mbDialogLostFocus(false)
     , mxInputRangeText(m_xBuilder->weld_label("cell-range-label"))
     , mxInputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("cell-range-edit")))
@@ -105,7 +105,7 @@ void ScRandomNumberGeneratorDialog::Init()
 
 void ScRandomNumberGeneratorDialog::GetRangeFromSelection()
 {
-    mpViewData->GetSimpleArea(maInputRange);
+    mrViewData.GetSimpleArea(maInputRange);
     OUString aCurrentString(maInputRange.Format(mrDoc, ScRefFlags::RANGE_ABS_3D, mrDoc.GetAddressConvention()));
     mxInputRangeEdit->SetText( aCurrentString );
 }
@@ -256,9 +256,9 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const
     OUString aDistributionName = ScResId(pDistributionStringId);
     aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
 
-    ScDocShell* pDocShell = mpViewData->GetDocShell();
+    ScDocShell* pDocShell = mrViewData.GetDocShell();
     SfxUndoManager* pUndoManager = pDocShell->GetUndoManager();
-    pUndoManager->EnterListAction( aUndo, aUndo, 0, mpViewData->GetViewShell()->GetViewShellId() );
+    pUndoManager->EnterListAction( aUndo, aUndo, 0, mrViewData.GetViewShell()->GetViewShellId() );
 
     SCROW nRowStart = maInputRange.aStart.Row();
     SCROW nRowEnd   = maInputRange.aEnd.Row();
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 246c549c6105..3149fd1251cc 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -735,7 +735,7 @@ void ScDrawTransferObj::InitDocShell()
     aViewData.SetScreen( aDestArea );
     aViewData.SetCurX( 0 );
     aViewData.SetCurY( 0 );
-    pDocSh->UpdateOle(&aViewData, true);
+    pDocSh->UpdateOle(aViewData, true);
 }
 
 namespace
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index f478c23448f7..ff50f6fc4247 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -801,7 +801,7 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize)
     //pDocSh->SvInPlaceObject::SetVisArea( aNewArea );
     pDocSh->SetVisArea( aNewArea );
 
-    pDocSh->UpdateOle(&aViewData, true);
+    pDocSh->UpdateOle(aViewData, true);
 
     //! SetDocumentModified?
     if ( rDestDoc.IsChartListenerCollectionNeedsUpdate() )
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 2c4765ef64dc..f3b1a90b1bce 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -149,7 +149,7 @@ bool ScDocShell::IsOle() const
     return (GetCreateMode() == SfxObjectCreateMode::EMBEDDED);
 }
 
-void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize )
+void ScDocShell::UpdateOle(const ScViewData& rViewData, bool bSnapSize)
 {
     //  if it isn't Ole at all, one can be spared the calculations
     //  (VisArea will then be reset at the save)
@@ -157,8 +157,6 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize )
     if (GetCreateMode() == SfxObjectCreateMode::STANDARD)
         return;
 
-    OSL_ENSURE(pViewData,"pViewData==0 at ScDocShell::UpdateOle");
-
     tools::Rectangle aOldArea = SfxObjectShell::GetVisArea();
     tools::Rectangle aNewArea = aOldArea;
 
@@ -167,15 +165,15 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize )
         aNewArea = m_aDocument.GetEmbeddedRect();
     else
     {
-        SCTAB nTab = pViewData->GetTabNo();
+        SCTAB nTab = rViewData.GetTabNo();
         if ( nTab != m_aDocument.GetVisibleTab() )
             m_aDocument.SetVisibleTab( nTab );
 
         bool bNegativePage = m_aDocument.IsNegativePage( nTab );
-        SCCOL nX = pViewData->GetPosX(SC_SPLIT_LEFT);
+        SCCOL nX = rViewData.GetPosX(SC_SPLIT_LEFT);
         if ( nX != m_aDocument.GetPosLeft() )
             m_aDocument.SetPosLeft( nX );
-        SCROW nY = pViewData->GetPosY(SC_SPLIT_BOTTOM);
+        SCROW nY = rViewData.GetPosY(SC_SPLIT_BOTTOM);
         if ( nY != m_aDocument.GetPosTop() )
             m_aDocument.SetPosTop( nY );
         tools::Rectangle aMMRect = m_aDocument.GetMMRect( nX,nY, nX,nY, nTab );
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index 4e6607f9ca6a..d10662cf6281 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -24,7 +24,7 @@ class ScRandomNumberGeneratorDialog : public ScAnyRefDlgController
 public:
     ScRandomNumberGeneratorDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
-        weld::Window* pParent, ScViewData* pViewData );
+        weld::Window* pParent, ScViewData& rViewData );
 
     virtual ~ScRandomNumberGeneratorDialog() override;
 
@@ -34,7 +34,7 @@ public:
 
 private:
     // Data
-    ScViewData*                mpViewData;
+    ScViewData&                mrViewData;
     const ScDocument&          mrDoc;
 
     ScRange             maInputRange;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 8a7fc31c1364..706d47cc6996 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -283,7 +283,7 @@ public:
     void            DoRecalc( bool bApi );
     void            DoHardRecalc();
 
-    void            UpdateOle( const ScViewData* pViewData, bool bSnapSize = false);
+    void            UpdateOle(const ScViewData& rViewData, bool bSnapSize = false);
     bool            IsOle() const;
 
     void            DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2 );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3051ce6586e3..d0826b1fd45a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2083,7 +2083,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         pView->StopRefMode();
         mrViewData.ResetFillMode();
         pView->GetFunctionSet().SetAnchorFlag( false );
-        mrViewData.GetDocShell()->UpdateOle(&mrViewData);
+        mrViewData.GetDocShell()->UpdateOle(mrViewData);
     }
 
     bool bRefMode = mrViewData.IsRefMode();
@@ -4156,7 +4156,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                                 nCorrectCursorPosCol = nSizeX;
                             }
                         }
-                        pDocSh->UpdateOle( &mrViewData );
+                        pDocSh->UpdateOle(mrViewData);
                         pView->CellContentChanged();
                     }
                 }
@@ -4202,7 +4202,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                                 ScRange aErrorRange( ScAddress::UNINITIALIZED );
                                 bDone = aDest.Move( -nSizeX, 0, 0, aErrorRange, &rThisDoc );
                             }
-                            pDocSh->UpdateOle( &mrViewData );
+                            pDocSh->UpdateOle(mrViewData);
                             pView->CellContentChanged();
                         }
                     }
@@ -4290,7 +4290,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                     bDone = pDocSh->GetDocFunc().InsertCells( aDest, nullptr, meDragInsertMode, true /*bRecord*/, true /*bApi*/, true /*bPartOfPaste*/ );
                     if ( bDone )
                     {
-                        pDocSh->UpdateOle( &mrViewData );
+                        pDocSh->UpdateOle(mrViewData);
                         pView->CellContentChanged();
                     }
                 }
@@ -4350,7 +4350,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 bDone = pDocSh->GetDocFunc().InsertCells( aDest, nullptr, meDragInsertMode, true /*bRecord*/, true /*bApi*/, true /*bPartOfPaste*/ );
                 if ( bDone )
                 {
-                    pDocSh->UpdateOle( &mrViewData );
+                    pDocSh->UpdateOle(mrViewData);
                     pView->CellContentChanged();
                 }
             }
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 409726a867c4..b8703e22bf62 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -240,7 +240,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
             PutInOrder(nStartY,nEndY);
             rDoc.SetEmbedded( ScRange(nStartX,nStartY,nTab, nEndX,nEndY,nTab) );
             ScDocShell* pDocSh = aViewData.GetDocShell();
-            pDocSh->UpdateOle( &aViewData, true );
+            pDocSh->UpdateOle( aViewData, true );
             pDocSh->SetDocumentModified();
         }
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 13a50fe07048..481b5c57c6fb 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -237,7 +237,7 @@ void ScTabViewShell::Deactivate(bool bMDI)
         ActivateView( false, false );
 
         if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace
-            GetViewData().GetDocShell()->UpdateOle(&GetViewData(), true);
+            GetViewData().GetDocShell()->UpdateOle(GetViewData(), true);
 
         if ( pHdl )
             pHdl->NotifyChange( nullptr, true ); // timer-delayed due to document switching
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index 664f0d1180d9..9a743c295b82 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -37,13 +37,13 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine
 bool ScTabViewShell::HasSelection( bool bText ) const
 {
     bool bHas = false;
-    ScViewData* pData = const_cast<ScViewData*>(&GetViewData());
+    ScViewData& rData = const_cast<ScViewData&>(GetViewData());
     if ( bText )
     {
         // Content contained: Count2 >= 1
-        ScDocument& rDoc = pData->GetDocument();
-        ScMarkData& rMark = pData->GetMarkData();
-        ScAddress aCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() );
+        ScDocument& rDoc = rData.GetDocument();
+        ScMarkData& rMark = rData.GetMarkData();
+        ScAddress aCursor( rData.GetCurX(), rData.GetCurY(), rData.GetTabNo() );
         double fVal = 0.0;
         if ( rDoc.GetSelectionFunction( SUBTOTAL_FUNC_CNT2, aCursor, rMark, fVal ) )
             bHas = ( fVal > 0.5 );
@@ -51,7 +51,7 @@ bool ScTabViewShell::HasSelection( bool bText ) const
     else
     {
         ScRange aRange;
-        ScMarkType eMarkType = pData->GetSimpleArea( aRange );
+        ScMarkType eMarkType = rData.GetSimpleArea( aRange );
         if ( eMarkType == SC_MARK_SIMPLE )
             bHas = ( aRange.aStart != aRange.aEnd );    // more than 1 cell
         else
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 71afb1e75d34..688d268fc5ef 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -231,7 +231,7 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
             break;
         }
         case SID_RANDOM_NUMBER_GENERATOR_DIALOG:
-            xResult = std::make_shared<ScRandomNumberGeneratorDialog>(pB, pCW, pParent, &GetViewData());
+            xResult = std::make_shared<ScRandomNumberGeneratorDialog>(pB, pCW, pParent, GetViewData());
             break;
         case SID_DEFINE_DBNAME:
         {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 41b1a8f8ddf9..8260ef688030 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -172,7 +172,7 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
     }
 
     if ( bPaint && bAnyChanged )
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
 
     if (comphelper::LibreOfficeKit::isActive())
     {
@@ -1252,7 +1252,7 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bCenter )
             //DoneBlockMode( sal_False);
             Unmark();
 
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
             UpdateInputLine();
 
             OUString aStartAddress = aMarkRange.aStart.GetColRowString();
@@ -1345,7 +1345,7 @@ bool ScViewFunc::RemoveMerge()
         MarkRange( aExtended );
 
         if (bOk)
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
     }
 
     OUString aCellLocation = aRange.aStart.GetColRowString();
@@ -1364,7 +1364,7 @@ void ScViewFunc::FillSimple( FillDir eDir )
         bool bSuccess = pDocSh->GetDocFunc().FillSimple( aRange, &rMark, eDir, false );
         if (bSuccess)
         {
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
             UpdateScrollBars();
 
             auto& rDoc = pDocSh->GetDocument();
@@ -1416,7 +1416,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
                                     fStart, fStep, fMax, false );
         if (bSuccess)
         {
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
             UpdateScrollBars();
 
             HelperNotifyChanges::NotifyIfChangesListeners(*pDocSh, aRange);
@@ -1440,7 +1440,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
         return;
 
     MarkRange( aRange, false );         // aRange was modified in FillAuto
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
     UpdateScrollBars();
 
     bool bDoAutoSpell = pDocSh->GetDocument().GetDocOptions().IsAutoSpell();
@@ -1861,7 +1861,7 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo )
 
         bool bSuccess = pDocSh->GetDocFunc().AutoFormat( aRange, &rMark, nFormatNo, false );
         if (bSuccess)
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -3365,7 +3365,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
                        nEndCol, nEndRow, nEndTab,
                        PaintPartFlags::Grid, SC_PF_LINES | SC_PF_TESTMERGE );
 
-    pDocSh->UpdateOle( &GetViewData() );
+    pDocSh->UpdateOle(GetViewData());
     pDocSh->SetDocumentModified();
 }
 
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index b80037080d63..50b73566b1a7 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -147,7 +147,7 @@ void ScViewFunc::CutToClip()
                 std::make_unique<ScUndoCut>( pDocSh, aRange, aOldEnd, rMark, std::move(pUndoDoc) ) );
 
         aModificator.SetDocumentModified();
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
 
         CellContentChanged();
 
@@ -1795,7 +1795,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark
 {
     ScViewData& rViewData = GetViewData();
     ScDocShell* pDocSh = rViewData.GetDocShell();
-    pDocSh->UpdateOle(&rViewData);
+    pDocSh->UpdateOle(rViewData);
 
     SelectionChanged(true);
 
@@ -1897,7 +1897,7 @@ bool ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
 
         MarkRange( ScRange( rDestPos, aDestEnd ), false );          //! sal_False ???
 
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         SelectionChanged();
         ResetAutoSpell();
     }
@@ -2016,7 +2016,7 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
     pDocSh->PostPaint(
         ScRange(nStartCol, nCurrentRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab),
         nPaint, nExtFlags);
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 272bd25fad9f..535c0427fb4f 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -172,7 +172,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
             aImpEx.ImportString( aStr, SotClipboardFormatId::RICHTEXT );
 
         AdjustRowHeight( nStartRow, aImpEx.GetRange().aEnd.Row() );
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         ShowAllCursors();
     }
 }
@@ -299,7 +299,7 @@ void ScViewFunc::DoRefConversion()
     }
 
     pDocSh->PostPaint( aMarkRange, PaintPartFlags::Grid );
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
     pDocSh->SetDocumentModified();
     CellContentChanged();
 
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index d7b4cf056562..659a42141870 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -51,9 +51,9 @@ bool bPasteIsMove = false;
 
 using namespace com::sun::star;
 
-static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, const Size& rSize )
+static void lcl_AdjustInsertPos( ScViewData& rData, Point& rPos, const Size& rSize )
 {
-    SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) );
+    SdrPage* pPage = rData.GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(rData.GetTabNo()) );
     OSL_ENSURE(pPage,"pPage ???");
     Size aPgSize( pPage->GetSize() );
     if (aPgSize.Width() < 0)
@@ -193,7 +193,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
         SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
         aView.MarkAllObj(pPv);
         Size aSize = aView.GetAllMarkedRect().GetSize();
-        lcl_AdjustInsertPos( &GetViewData(), aPos, aSize );
+        lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
 
         // don't change marking if OLE object is active
         // (at Drop from OLE object it would be deactivated in the middle of ExecuteDrag!)
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 0c39728dd6d2..d8dbe9ce748e 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -578,7 +578,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
     if (bAutoFormat)
         DoAutoAttributes(nCol, nRow, nTab, bNumFmtChanged);
 
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
 
     HelperNotifyChanges::NotifyIfChangesListeners(*pDocSh, rMark, nCol, nRow);
 
@@ -620,7 +620,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
         }
 
         pDocSh->PostPaintCell( aPos );
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         aModificator.SetDocumentModified();
     }
     else
@@ -732,7 +732,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
 
             ShowAllCursors();
 
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
 
             HelperNotifyChanges::NotifyIfChangesListeners(*pDocSh, rMark, nCol, nRow);
 
@@ -792,7 +792,7 @@ void ScViewFunc::EnterMatrix( const OUString& rString, ::formula::FormulaGrammar
         bool bSuccess = pDocSh->GetDocFunc().EnterMatrix(
             aRange, &rMark, nullptr, rString, false, false, EMPTY_OUSTRING, eGram );
         if (bSuccess)
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
         else
             PaintArea(nCol, nRow, nCol, nRow);        // possibly the edit-engine is still painted there
     }
@@ -1096,7 +1096,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
     rDoc.ApplySelectionPattern( rAttr, aFuncMark );
 
     pDocSh->PostPaint( aMarkRange, PaintPartFlags::Grid, nExt );
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
     aModificator.SetDocumentModified();
     CellContentChanged();
 
@@ -1197,7 +1197,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, bool bCursor
         pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
                            nEndCol,   nEndRow,   nEndTab,
                            PaintPartFlags::Grid, nExtFlags | SC_PF_TESTMERGE );
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         aModificator.SetDocumentModified();
         CellContentChanged();
     }
@@ -1237,7 +1237,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, bool bCursor
         pOldPat.reset();     // is copied in undo (Pool)
 
         pDocSh->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PaintPartFlags::Grid, nExtFlags | SC_PF_TESTMERGE );
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         aModificator.SetDocumentModified();
         CellContentChanged();
     }
@@ -1611,7 +1611,7 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool bRecord, bool bPartOfPaste )
             bool bInsertCols = ( eCmd == INS_INSCOLS_BEFORE || eCmd == INS_INSCOLS_AFTER);
             bool bInsertRows = ( eCmd == INS_INSROWS_BEFORE || eCmd == INS_INSROWS_AFTER );
 
-            pDocSh->UpdateOle(&GetViewData());
+            pDocSh->UpdateOle(GetViewData());
             CellContentChanged();
             ResetAutoSpell();
 
@@ -1685,7 +1685,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd )
             pDocSh->GetDocFunc().DeleteCells( aRange, &rMark, eCmd, false );
         }
 
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         CellContentChanged();
         ResetAutoSpell();
 
@@ -1987,7 +1987,7 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags nFlags )
     else
         rDocFunc.DeleteContents(aFuncMark, nFlags, bRecord, false);
 
-    pDocSh->UpdateOle(&GetViewData());
+    pDocSh->UpdateOle(GetViewData());
 
     if (ScModelObj *pModelObj = HelperNotifyChanges::getMustPropagateChangesModel(*pDocSh))
     {
@@ -2296,7 +2296,7 @@ void ScViewFunc::SetWidthOrHeight(
             }
         }
 
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
         if( !pDocSh->IsReadOnly() )
             aModificator.SetDocumentModified();
     }
@@ -2841,7 +2841,7 @@ void ScViewFunc::ChangeIndent( bool bIncrement )
     bool bSuccess = pDocSh->GetDocFunc().ChangeIndent( aWorkMark, bIncrement, false );
     if (bSuccess)
     {
-        pDocSh->UpdateOle(&rViewData);
+        pDocSh->UpdateOle(rViewData);
         StartFormatArea();
 
         // stuff for sidebar panels
@@ -2983,7 +2983,7 @@ void ScViewFunc::InsertNameList()
     ScAddress aPos( GetViewData().GetCurX(), GetViewData().GetCurY(), GetViewData().GetTabNo() );
     ScDocShell* pDocSh = GetViewData().GetDocShell();
     if ( pDocSh->GetDocFunc().InsertNameList( aPos, false ) )
-        pDocSh->UpdateOle(&GetViewData());
+        pDocSh->UpdateOle(GetViewData());
 }
 
 void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr  )