diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-13 20:41:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-14 11:20:58 +0200 |
| commit | 61252edf7ebe2801f39b42c43900c6861ebfd04a (patch) | |
| tree | 73b8f0555fc7c781696704eae84e4df2efdc2640 | |
| parent | tdf#133502: sd_export_ooxml2: Add unittest (diff) | |
| download | core-61252edf7ebe2801f39b42c43900c6861ebfd04a.tar.gz core-61252edf7ebe2801f39b42c43900c6861ebfd04a.zip | |
ScRangeData ctor variant always dereferences its ScDocument* arg
Change-Id: I67c344bfd14e55992a9ae07099e2d58bb99c4d3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102621
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/inc/rangenam.hxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 8 | ||||
| -rw-r--r-- | sc/source/core/tool/rangenam.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/rtf/eeimpars.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 6e19873f63d7..36c31aea33ed 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -94,7 +94,7 @@ public: const ScTokenArray& rArr, const ScAddress& rAdr = ScAddress(), Type nType = Type::Name ); - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument& rDoc, const OUString& rName, const ScAddress& rTarget ); // rTarget is ABSPOS jump label diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index fa0bb5cdc0e5..d407efaff99a 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1606,7 +1606,7 @@ void Test::testNamedRange() } // Test using another-sheet-local name, scope Sheet1. - ScRangeData* pLocal1 = new ScRangeData( m_pDoc, "local1", ScAddress(0,0,0)); + ScRangeData* pLocal1 = new ScRangeData( *m_pDoc, "local1", ScAddress(0,0,0)); ScRangeData* pLocal2 = new ScRangeData( m_pDoc, "local2", "$Sheet1.$A$1"); ScRangeData* pLocal3 = new ScRangeData( m_pDoc, "local3", "Sheet1.$A$1"); ScRangeData* pLocal4 = new ScRangeData( m_pDoc, "local4", "$A$1"); // implicit relative sheet reference @@ -3336,12 +3336,12 @@ void Test::testCopyPaste() ScAddress aAdr (0, 0, 0); //create some range names, local and global - ScRangeData* pLocal1 = new ScRangeData( m_pDoc, "local1", aAdr); - ScRangeData* pLocal2 = new ScRangeData( m_pDoc, "local2", aAdr); + ScRangeData* pLocal1 = new ScRangeData( *m_pDoc, "local1", aAdr); + ScRangeData* pLocal2 = new ScRangeData( *m_pDoc, "local2", aAdr); ScRangeData* pLocal3 = new ScRangeData( m_pDoc, "local3", "$Sheet1.$A$1"); ScRangeData* pLocal4 = new ScRangeData( m_pDoc, "local4", "Sheet1.$A$1"); ScRangeData* pLocal5 = new ScRangeData( m_pDoc, "local5", "$A$1"); // implicit relative sheet reference - ScRangeData* pGlobal = new ScRangeData( m_pDoc, "global", aAdr); + ScRangeData* pGlobal = new ScRangeData( *m_pDoc, "global", aAdr); const OUString aGlobal2Symbol("$Sheet1.$A$1:$A$23"); ScRangeData* pGlobal2 = new ScRangeData( m_pDoc, "global2", aGlobal2Symbol); std::unique_ptr<ScRangeName> pGlobalRangeName(new ScRangeName()); diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 44a2bcff7be7..2d739cbab13f 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -98,15 +98,15 @@ ScRangeData::ScRangeData( ScDocument* pDok, InitCode(); } -ScRangeData::ScRangeData( ScDocument* pDok, +ScRangeData::ScRangeData( ScDocument& rDok, const OUString& rName, const ScAddress& rTarget ) : aName ( rName ), aUpperName ( ScGlobal::getCharClassPtr()->uppercase( rName ) ), - pCode ( new ScTokenArray(*pDok) ), + pCode ( new ScTokenArray(rDok) ), aPos ( rTarget ), eType ( Type::Name ), - pDoc ( pDok ), + pDoc ( &rDok ), eTempGrammar( FormulaGrammar::GRAM_UNSPECIFIED ), nIndex ( 0 ), bModified ( false ) diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index b2bc46c8ab0c..46bc08a34e77 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -412,7 +412,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu { // Anchor Name => RangeName if (!pRangeNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(*pE->pName))) { - ScRangeData* pData = new ScRangeData( mpDoc, *pE->pName, + ScRangeData* pData = new ScRangeData( *mpDoc, *pE->pName, ScAddress( nCol, nRow, nTab ) ); pRangeNames->insert( pData ); } |