[Libreoffice-commits] core.git: sc/inc sc/source

[Caolán McNamara (via logerrit)]

 sc/inc/document.hxx               |    2 +-
 sc/source/core/data/documen2.cxx  |    2 +-
 sc/source/core/data/documen9.cxx  |    8 ++++----
 sc/source/ui/docshell/docsh5.cxx  |    2 +-
 sc/source/ui/docshell/tablink.cxx |    2 +-
 sc/source/ui/view/viewfun2.cxx    |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9dcf0da44e4abb92ae6f3846f6dc7383e486617e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 15 10:12:40 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 16 10:59:04 2020 +0200

    TransferDrawPage always dereferences its ScDocument* argument
    
    Change-Id: Ie2639fc10f1bf6a5c046e4e075337b117a8f6144
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102837
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0e2fc1142356..a2c4f8503688 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -957,7 +957,7 @@ public:
     SC_DLLPUBLIC sal_uLong      TransferTab(ScDocument& rSrcDoc, SCTAB nSrcPos, SCTAB nDestPos,
                                             bool bInsertNew = true,
                                             bool bResultsOnly = false );
-    SC_DLLPUBLIC void           TransferDrawPage(const ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos);
+    SC_DLLPUBLIC void           TransferDrawPage(const ScDocument& rSrcDoc, SCTAB nSrcPos, SCTAB nDestPos);
     SC_DLLPUBLIC void           SetVisible( SCTAB nTab, bool bVisible );
     SC_DLLPUBLIC bool           IsVisible( SCTAB nTab ) const;
     bool                        IsStreamValid( SCTAB nTab ) const;
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7b50c9d1ec38..3e08ae45a35d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1010,7 +1010,7 @@ sal_uLong ScDocument::TransferTab( ScDocument& rSrcDoc, SCTAB nSrcPos,
         //  copy Drawing
 
         if (bInsertNew)
-            TransferDrawPage( &rSrcDoc, nSrcPos, nDestPos );
+            TransferDrawPage( rSrcDoc, nSrcPos, nDestPos );
 
         maTabs[nDestPos]->SetPendingRowHeights( rSrcDoc.maTabs[nSrcPos]->IsPendingRowHeights() );
     }
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index ee42ba27b14a..fdf2605b09a0 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -61,11 +61,11 @@ void ScDocument::BeginDrawUndo()
         mpDrawLayer->BeginCalcUndo(false);
 }
 
-void ScDocument::TransferDrawPage(const ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos)
+void ScDocument::TransferDrawPage(const ScDocument& rSrcDoc, SCTAB nSrcPos, SCTAB nDestPos)
 {
-    if (mpDrawLayer && pSrcDoc->mpDrawLayer)
+    if (mpDrawLayer && rSrcDoc.mpDrawLayer)
     {
-        SdrPage* pOldPage = pSrcDoc->mpDrawLayer->GetPage(static_cast<sal_uInt16>(nSrcPos));
+        SdrPage* pOldPage = rSrcDoc.mpDrawLayer->GetPage(static_cast<sal_uInt16>(nSrcPos));
         SdrPage* pNewPage = mpDrawLayer->GetPage(static_cast<sal_uInt16>(nDestPos));
 
         if (pOldPage && pNewPage)
@@ -89,7 +89,7 @@ void ScDocument::TransferDrawPage(const ScDocument* pSrcDoc, SCTAB nSrcPos, SCTA
 
     //  make sure the data references of charts are adapted
     //  (this must be after InsertObject!)
-    ScChartHelper::AdjustRangesOfChartsOnDestinationPage( pSrcDoc, this, nSrcPos, nDestPos );
+    ScChartHelper::AdjustRangesOfChartsOnDestinationPage( &rSrcDoc, this, nSrcPos, nDestPos );
     ScChartHelper::UpdateChartsOnDestinationPage(this, nDestPos);
 }
 
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index cdba44ccdca0..039130929030 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -869,7 +869,7 @@ sal_uLong ScDocShell::TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos,
 
     // TransferTab doesn't copy drawing objects with bInsertNew=FALSE
     if ( nErrVal > 0 && !bInsertNew)
-        m_aDocument.TransferDrawPage( &rSrcDoc, nSrcPos, nDestPos );
+        m_aDocument.TransferDrawPage( rSrcDoc, nSrcPos, nDestPos );
 
     if(nErrVal>0 && rSrcDoc.IsScenario( nSrcPos ))
     {
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index c39b0fb9cecf..b337605e0308 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -242,7 +242,7 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter,
                 bFirst = false;
                 ScRange aRange(0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab);
                 rDoc.CopyToDocument(aRange, InsertDeleteFlags::ALL, false, *pUndoDoc);
-                pUndoDoc->TransferDrawPage( &rDoc, nTab, nTab );
+                pUndoDoc->TransferDrawPage( rDoc, nTab, nTab );
                 pUndoDoc->SetLink( nTab, nMode, aFileName, aFilterName,
                                    aOptions, aTabName, GetRefreshDelay() );
                 pUndoDoc->SetTabBgColor( nTab, rDoc.GetTabBgColor(nTab) );
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 1a2da8ecde40..fd0e48b8eff7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2503,7 +2503,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord )
                 pUndoDoc->SetTabProtection(nTab, rDoc.GetTabProtection(nTab));
 
             //  Drawing-Layer is responsible for its Undo  !!!
-            //      pUndoDoc->TransferDrawPage(pDoc, nTab,nTab);
+            //      pUndoDoc->TransferDrawPage(rDoc, nTab,nTab);
         }
 
         pUndoDoc->AddUndoTab( 0, nCount-1 );            //  all Tabs for references