diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-13 20:45:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-14 06:57:53 +0100 |
commit | 5bcdbf03012e9d2754c3eb166bd5a01201406d9b (patch) | |
tree | c910eac80023f9cb1c0f943c8edad1928977968f /sc/source/core/tool | |
parent | 113444f59dc7690850919155b9b164b1a686bbe7 (diff) |
sc: rowcol: tdf#50916 convert Valid* methods
which means we end up passing around ScDocument*
__everywhere__
Change-Id: I44d235ca5e9d57519f068b6880ee7d66f3ceb529
Reviewed-on: https://gerrit.libreoffice.org/83548
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core/tool')
-rw-r--r-- | sc/source/core/tool/address.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/chartlis.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 197 | ||||
-rw-r--r-- | sc/source/core/tool/consoli.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/detfunc.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/doubleref.cxx | 13 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 18 | ||||
-rw-r--r-- | sc/source/core/tool/interpr2.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 22 | ||||
-rw-r--r-- | sc/source/core/tool/rangenam.cxx | 24 | ||||
-rw-r--r-- | sc/source/core/tool/refdata.cxx | 96 | ||||
-rw-r--r-- | sc/source/core/tool/reftokenhelper.cxx | 20 | ||||
-rw-r--r-- | sc/source/core/tool/refupdat.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/sharedformula.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 202 |
15 files changed, 303 insertions, 331 deletions
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 930833057634..0ee1eeeb4862 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2550,7 +2550,7 @@ bool AlphaToCol( const ScDocument* pDoc, SCCOL& rCol, const OUString& rStr) nResult += ScGlobal::ToUpperAlpha(c) - 'A'; ++nPos; } - bool bOk = (ValidCol(nResult) && nPos > 0); + bool bOk = (pDoc->ValidCol(nResult) && nPos > 0); if (bOk) rCol = nResult; return bOk; diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index fab194a2be5d..f5560479e109 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -186,7 +186,7 @@ void ScChartListener::Update() ScRangeListRef ScChartListener::GetRangeList() const { ScRangeListRef aRLRef(new ScRangeList); - ScRefTokenHelper::getRangeListFromTokens(*aRLRef, *mpTokens, ScAddress()); + ScRefTokenHelper::getRangeListFromTokens(mpDoc, *aRLRef, *mpTokens, ScAddress()); return aRLRef; } @@ -230,7 +230,7 @@ public: else { ScRange aRange; - ScRefTokenHelper::getRangeFromToken(aRange, pToken, ScAddress(), bExternal); + ScRefTokenHelper::getRangeFromToken(mpDoc, aRange, pToken, ScAddress(), bExternal); if (mbStart) startListening(aRange); else @@ -294,7 +294,7 @@ void ScChartListener::UpdateChartIntersecting( const ScRange& rRange ) ScTokenRef pToken; ScRefTokenHelper::getTokenFromRange(mpDoc, pToken, rRange); - if (ScRefTokenHelper::intersects(*mpTokens, pToken, ScAddress())) + if (ScRefTokenHelper::intersects(mpDoc, *mpTokens, pToken, ScAddress())) { // force update (chart has to be loaded), don't use ScChartListener::Update mpDoc->UpdateChart(GetName()); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 7f1460db8f51..f5d30d2e8f36 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -710,8 +710,8 @@ namespace { struct Convention_A1 : public ScCompiler::Convention { explicit Convention_A1( FormulaGrammar::AddressConvention eConv ) : ScCompiler::Convention( eConv ) { } - static void MakeColStr( OUStringBuffer& rBuffer, SCCOL nCol ); - static void MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow ); + static void MakeColStr( ScSheetLimits& rLimits, OUStringBuffer& rBuffer, SCCOL nCol ); + static void MakeRowStr( ScSheetLimits& rLimits, OUStringBuffer& rBuffer, SCROW nRow ); ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, @@ -741,17 +741,17 @@ struct Convention_A1 : public ScCompiler::Convention } -void Convention_A1::MakeColStr( OUStringBuffer& rBuffer, SCCOL nCol ) +void Convention_A1::MakeColStr( ScSheetLimits& rLimits, OUStringBuffer& rBuffer, SCCOL nCol ) { - if ( !ValidCol( nCol) ) + if ( !rLimits.ValidCol(nCol) ) rBuffer.append(ScResId(STR_NO_REF_TABLE)); else ::ScColToAlpha( rBuffer, nCol); } -void Convention_A1::MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow ) +void Convention_A1::MakeRowStr( ScSheetLimits& rLimits, OUStringBuffer& rBuffer, SCROW nRow ) { - if ( !ValidRow(nRow) ) + if ( !rLimits.ValidRow(nRow) ) rBuffer.append(ScResId(STR_NO_REF_TABLE)); else rBuffer.append(sal_Int32(nRow + 1)); @@ -781,7 +781,7 @@ struct ConventionOOO_A1 : public Convention_A1 }; static void MakeOneRefStrImpl( - OUStringBuffer& rBuffer, + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScSingleRefData& rRef, const ScAddress& rAbsRef, bool bForceTab, bool bODF, SingletonDisplay eSingletonDisplay ) @@ -815,20 +815,20 @@ struct ConventionOOO_A1 : public Convention_A1 { if (!rRef.IsColRel()) rBuffer.append('$'); - if (!ValidCol(rAbsRef.Col()) || rRef.IsColDeleted()) + if (!rLimits.ValidCol(rAbsRef.Col()) || rRef.IsColDeleted()) rBuffer.append(rErrRef); else - MakeColStr(rBuffer, rAbsRef.Col()); + MakeColStr(rLimits, rBuffer, rAbsRef.Col()); } if (eSingletonDisplay != SINGLETON_COL) { if (!rRef.IsRowRel()) rBuffer.append('$'); - if (!ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted()) + if (!rLimits.ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted()) rBuffer.append(rErrRef); else - MakeRowStr(rBuffer, rAbsRef.Row()); + MakeRowStr(rLimits, rBuffer, rAbsRef.Row()); } } @@ -836,8 +836,8 @@ struct ConventionOOO_A1 : public Convention_A1 const ScComplexRefData& rRef, bool bFromRangeName ) { // If any part is error, display as such. - if (!ValidCol(rAbs1.Col()) || rRef.Ref1.IsColDeleted() || !ValidRow(rAbs1.Row()) || rRef.Ref1.IsRowDeleted() || - !ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() || !ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted()) + if (!rLimits.ValidCol(rAbs1.Col()) || rRef.Ref1.IsColDeleted() || !rLimits.ValidRow(rAbs1.Row()) || rRef.Ref1.IsRowDeleted() || + !rLimits.ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() || !rLimits.ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted()) return SINGLETON_NONE; // A:A or $A:$A or A:$A or $A:A @@ -875,17 +875,17 @@ struct ConventionOOO_A1 : public Convention_A1 { // In case absolute/relative positions weren't separately available: // transform relative to absolute! - ScAddress aAbs1 = rRef.Ref1.toAbs(rPos), aAbs2; + ScAddress aAbs1 = rRef.Ref1.toAbs(rLimits, rPos), aAbs2; if( !bSingleRef ) - aAbs2 = rRef.Ref2.toAbs(rPos); + aAbs2 = rRef.Ref2.toAbs(rLimits, rPos); SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : getSingletonDisplay( rLimits, aAbs1, aAbs2, rRef, bFromRangeName); - MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, false, eSingleton); + MakeOneRefStrImpl(rLimits, rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, false, eSingleton); if (!bSingleRef) { rBuffer.append(':'); - MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref2, aAbs2, aAbs1.Tab() != aAbs2.Tab(), false, + MakeOneRefStrImpl(rLimits, rBuffer, rErrRef, rTabNames, rRef.Ref2, aAbs2, aAbs1.Tab() != aAbs2.Tab(), false, eSingleton); } } @@ -917,10 +917,11 @@ struct ConventionOOO_A1 : public Convention_A1 } static bool makeExternalSingleRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef, const ScAddress& rPos, bool bDisplayTabName, bool bEncodeUrl ) { - ScAddress aAbsRef = rRef.toAbs(rPos); + ScAddress aAbsRef = rRef.toAbs(rLimits, rPos); if (bDisplayTabName) { OUString aFile; @@ -940,15 +941,16 @@ struct ConventionOOO_A1 : public Convention_A1 if (!rRef.IsColRel()) rBuffer.append('$'); - MakeColStr( rBuffer, aAbsRef.Col()); + MakeColStr( rLimits, rBuffer, aAbsRef.Col()); if (!rRef.IsRowRel()) rBuffer.append('$'); - MakeRowStr( rBuffer, aAbsRef.Row()); + MakeRowStr( rLimits, rBuffer, aAbsRef.Row()); return true; } static void makeExternalRefStrImpl( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef, bool bODF ) { @@ -956,24 +958,26 @@ struct ConventionOOO_A1 : public Convention_A1 rBuffer.append( '['); bool bEncodeUrl = bODF; - makeExternalSingleRefStr(rBuffer, rFileName, rTabName, rRef, rPos, true, bEncodeUrl); + makeExternalSingleRefStr(rLimits, rBuffer, rFileName, rTabName, rRef, rPos, true, bEncodeUrl); if (bODF) rBuffer.append( ']'); } virtual void makeExternalRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef ) const override { - makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, false); + makeExternalRefStrImpl(rLimits, rBuffer, rPos, rFileName, rTabName, rRef, false); } static void makeExternalRefStrImpl( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef, bool bODF ) { - ScRange aAbsRange = rRef.toAbs(rPos); + ScRange aAbsRange = rRef.toAbs(rLimits, rPos); if (bODF) rBuffer.append( '['); @@ -982,7 +986,7 @@ struct ConventionOOO_A1 : public Convention_A1 do { - if (!makeExternalSingleRefStr(rBuffer, rFileName, rTabName, rRef.Ref1, rPos, true, bEncodeUrl)) + if (!makeExternalSingleRefStr(rLimits, rBuffer, rFileName, rTabName, rRef.Ref1, rPos, true, bEncodeUrl)) break; rBuffer.append(':'); @@ -1000,7 +1004,7 @@ struct ConventionOOO_A1 : public Convention_A1 } else if (bODF) rBuffer.append( '.'); // need at least the sheet separator in ODF - makeExternalSingleRefStr( + makeExternalSingleRefStr(rLimits, rBuffer, rFileName, aLastTabName, rRef.Ref2, rPos, bDisplayTabName, bEncodeUrl); } while (false); @@ -1009,12 +1013,12 @@ struct ConventionOOO_A1 : public Convention_A1 } virtual void makeExternalRefStr( - ScSheetLimits&, + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef ) const override { - makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, false); + makeExternalRefStrImpl(rLimits, rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, false); } }; @@ -1035,12 +1039,12 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 rBuffer.append('['); // In case absolute/relative positions weren't separately available: // transform relative to absolute! - ScAddress aAbs1 = rRef.Ref1.toAbs(rPos), aAbs2; + ScAddress aAbs1 = rRef.Ref1.toAbs(rLimits, rPos), aAbs2; if( !bSingleRef ) - aAbs2 = rRef.Ref2.toAbs(rPos); + aAbs2 = rRef.Ref2.toAbs(rLimits, rPos); - if (FormulaGrammar::isODFF(eGram) && (rRef.Ref1.IsDeleted() || !ValidAddress(aAbs1) || - (!bSingleRef && (rRef.Ref2.IsDeleted() || !ValidAddress(aAbs2))))) + if (FormulaGrammar::isODFF(eGram) && (rRef.Ref1.IsDeleted() || !rLimits.ValidAddress(aAbs1) || + (!bSingleRef && (rRef.Ref2.IsDeleted() || !rLimits.ValidAddress(aAbs2))))) { rBuffer.append(rErrRef); // For ODFF write [#REF!], but not for PODF so apps reading ODF @@ -1051,11 +1055,11 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 { SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : getSingletonDisplay( rLimits, aAbs1, aAbs2, rRef, bFromRangeName); - MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, true, eSingleton); + MakeOneRefStrImpl(rLimits, rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, true, eSingleton); if (!bSingleRef) { rBuffer.append(':'); - MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref2, aAbs2, aAbs1.Tab() != aAbs2.Tab(), true, + MakeOneRefStrImpl(rLimits, rBuffer, rErrRef, rTabNames, rRef.Ref2, aAbs2, aAbs1.Tab() != aAbs2.Tab(), true, eSingleton); } } @@ -1069,19 +1073,20 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 } virtual void makeExternalRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef ) const override { - makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, true); + makeExternalRefStrImpl(rLimits, rBuffer, rPos, rFileName, rTabName, rRef, true); } virtual void makeExternalRefStr( - ScSheetLimits& , + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef ) const override { - makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, true); + makeExternalRefStrImpl(rLimits, rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, true); } }; @@ -1092,10 +1097,11 @@ struct ConventionXL } static void GetTab( + ScSheetLimits& rLimits, const ScAddress& rPos, const std::vector<OUString>& rTabNames, const ScSingleRefData& rRef, OUString& rTabName ) { - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(rLimits, rPos); if (rRef.IsTabDeleted() || static_cast<size_t>(aAbs.Tab()) >= rTabNames.size()) { rTabName = ScResId( STR_NO_REF_TABLE ); @@ -1104,7 +1110,7 @@ struct ConventionXL rTabName = rTabNames[aAbs.Tab()]; } - static void MakeTabStr( OUStringBuffer& rBuf, + static void MakeTabStr( ScSheetLimits& rLimits, OUStringBuffer& rBuf, const ScAddress& rPos, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, @@ -1114,11 +1120,11 @@ struct ConventionXL { OUString aStartTabName, aEndTabName; - GetTab(rPos, rTabNames, rRef.Ref1, aStartTabName); + GetTab(rLimits, rPos, rTabNames, rRef.Ref1, aStartTabName); if( !bSingleRef && rRef.Ref2.IsFlag3D() ) { - GetTab(rPos, rTabNames, rRef.Ref2, aEndTabName); + GetTab(rLimits, rPos, rTabNames, rRef.Ref2, aEndTabName); } rBuf.append( aStartTabName ); @@ -1260,14 +1266,14 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL ConventionXL_A1() : Convention_A1( FormulaGrammar::CONV_XL_A1 ) { } explicit ConventionXL_A1( FormulaGrammar::AddressConvention eConv ) : Convention_A1( eConv ) { } - static void makeSingleCellStr( OUStringBuffer& rBuf, const ScSingleRefData& rRef, const ScAddress& rAbs ) + static void makeSingleCellStr( ScSheetLimits& rLimits, OUStringBuffer& rBuf, const ScSingleRefData& rRef, const ScAddress& rAbs ) { if (!rRef.IsColRel()) rBuf.append('$'); - MakeColStr(rBuf, rAbs.Col()); + MakeColStr(rLimits, rBuf, rAbs.Col()); if (!rRef.IsRowRel()) rBuf.append('$'); - MakeRowStr(rBuf, rAbs.Row()); + MakeRowStr(rLimits, rBuf, rAbs.Row()); } virtual void makeRefStr( @@ -1284,11 +1290,11 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL // Play fast and loose with invalid refs. There is not much point in producing // Foo!A1:#REF! versus #REF! at this point - ScAddress aAbs1 = aRef.Ref1.toAbs(rPos), aAbs2; + ScAddress aAbs1 = aRef.Ref1.toAbs(rLimits, rPos), aAbs2; - MakeTabStr(rBuf, rPos, rTabNames, aRef, bSingleRef); + MakeTabStr(rLimits, rBuf, rPos, rTabNames, aRef, bSingleRef); - if (!ValidAddress(aAbs1)) + if (!rLimits.ValidAddress(aAbs1)) { rBuf.append(rErrRef); return; @@ -1296,8 +1302,8 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL if( !bSingleRef ) { - aAbs2 = aRef.Ref2.toAbs(rPos); - if (!ValidAddress(aAbs2)) + aAbs2 = aRef.Ref2.toAbs(rLimits, rPos); + if (!rLimits.ValidAddress(aAbs2)) { rBuf.append(rErrRef); return; @@ -1307,11 +1313,11 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL { if (!aRef.Ref1.IsRowRel()) rBuf.append( '$' ); - MakeRowStr(rBuf, aAbs1.Row()); + MakeRowStr(rLimits, rBuf, aAbs1.Row()); rBuf.append( ':' ); if (!aRef.Ref2.IsRowRel()) rBuf.append( '$' ); - MakeRowStr(rBuf, aAbs2.Row()); + MakeRowStr(rLimits, rBuf, aAbs2.Row()); return; } @@ -1319,20 +1325,20 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL { if (!aRef.Ref1.IsColRel()) rBuf.append( '$' ); - MakeColStr(rBuf, aAbs1.Col()); + MakeColStr(rLimits, rBuf, aAbs1.Col()); rBuf.append( ':' ); if (!aRef.Ref2.IsColRel()) rBuf.append( '$' ); - MakeColStr(rBuf, aAbs2.Col()); + MakeColStr(rLimits, rBuf, aAbs2.Col()); return; } } - makeSingleCellStr(rBuf, aRef.Ref1, aAbs1); + makeSingleCellStr(rLimits, rBuf, aRef.Ref1, aAbs1); if (!bSingleRef) { rBuf.append( ':' ); - makeSingleCellStr(rBuf, aRef.Ref2, aAbs2); + makeSingleCellStr(rLimits, rBuf, aRef.Ref2, aAbs2); } } @@ -1377,6 +1383,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL } virtual void makeExternalRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef ) const override { @@ -1390,26 +1397,26 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL ScRangeStringConverter::AppendTableName(rBuffer, rTabName); rBuffer.append('!'); - makeSingleCellStr(rBuffer, rRef, rRef.toAbs(rPos)); + makeSingleCellStr(rLimits, rBuffer, rRef, rRef.toAbs(rLimits, rPos)); } virtual void makeExternalRefStr( - ScSheetLimits&, + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef ) const override { - ScRange aAbsRef = rRef.toAbs(rPos); + ScRange aAbsRef = rRef.toAbs(rLimits, rPos); ConventionXL::makeExternalDocStr(rBuffer, rFileName); ConventionXL::makeExternalTabNameRange(rBuffer, rTabName, rTabNames, aAbsRef); rBuffer.append('!'); - makeSingleCellStr(rBuffer, rRef.Ref1, aAbsRef.aStart); + makeSingleCellStr(rLimits, rBuffer, rRef.Ref1, aAbsRef.aStart); if (aAbsRef.aStart != aAbsRef.aEnd) { rBuffer.append(':'); - makeSingleCellStr(rBuffer, rRef.Ref2, aAbsRef.aEnd); + makeSingleCellStr(rLimits, rBuffer, rRef.Ref2, aAbsRef.aEnd); } } }; @@ -1487,6 +1494,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 } virtual void makeExternalRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, const OUString& rTabName, const ScSingleRefData& rRef ) const override { @@ -1509,11 +1517,11 @@ struct ConventionXL_OOX : public ConventionXL_A1 } rBuffer.append('!'); - makeSingleCellStr(rBuffer, rRef, rRef.toAbs(rPos)); + makeSingleCellStr(rLimits, rBuffer, rRef, rRef.toAbs(rLimits, rPos)); } virtual void makeExternalRefStr( - ScSheetLimits& , + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef ) const override @@ -1524,7 +1532,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 // sheet names as well. The [N] having to be within the quoted sheet // name is ugly enough... - ScRange aAbsRef = rRef.toAbs(rPos); + ScRange aAbsRef = rRef.toAbs(rLimits, rPos); OUStringBuffer aBuf; ConventionXL::makeExternalTabNameRange( aBuf, rTabName, rTabNames, aAbsRef); @@ -1541,11 +1549,11 @@ struct ConventionXL_OOX : public ConventionXL_A1 } rBuffer.append('!'); - makeSingleCellStr(rBuffer, rRef.Ref1, aAbsRef.aStart); + makeSingleCellStr(rLimits, rBuffer, rRef.Ref1, aAbsRef.aStart); if (aAbsRef.aStart != aAbsRef.aEnd) { rBuffer.append(':'); - makeSingleCellStr(rBuffer, rRef.Ref2, aAbsRef.aEnd); + makeSingleCellStr(rLimits, rBuffer, rRef.Ref2, aAbsRef.aEnd); } } @@ -1600,14 +1608,14 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL bool bSingleRef, bool /*bFromRangeName*/ ) const override { - ScRange aAbsRef = rRef.toAbs(rPos); + ScRange aAbsRef = rRef.toAbs(rLimits, rPos); ScComplexRefData aRef( rRef ); - MakeTabStr(rBuf, rPos, rTabNames, aRef, bSingleRef); + MakeTabStr(rLimits, rBuf, rPos, rTabNames, aRef, bSingleRef); // Play fast and loose with invalid refs. There is not much point in producing // Foo!A1:#REF! versus #REF! at this point - if (!ValidCol(aAbsRef.aStart.Col()) || !ValidRow(aAbsRef.aStart.Row())) + if (!rLimits.ValidCol(aAbsRef.aStart.Col()) || !rLimits.ValidRow(aAbsRef.aStart.Row())) { rBuf.append(rErrRef); return; @@ -1615,7 +1623,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL if( !bSingleRef ) { - if (!ValidCol(aAbsRef.aEnd.Col()) || !ValidRow(aAbsRef.aEnd.Row())) + if (!rLimits.ValidCol(aAbsRef.aEnd.Col()) || !rLimits.ValidRow(aAbsRef.aEnd.Row())) { rBuf.append(rErrRef); return; @@ -1699,6 +1707,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL } virtual void makeExternalRefStr( + ScSheetLimits& rLimits, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const OUString& rTabName, const ScSingleRefData& rRef ) const override { @@ -1708,7 +1717,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL // whole file path with [] because the file name can contain any // characters. - ScAddress aAbsRef = rRef.toAbs(rPos); + ScAddress aAbsRef = rRef.toAbs(rLimits, rPos); ConventionXL::makeExternalDocStr(rBuffer, rFileName); ScRangeStringConverter::AppendTableName(rBuffer, rTabName); rBuffer.append('!'); @@ -1723,13 +1732,13 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL const std::vector<OUString>& rTabNames, const OUString& rTabName, const ScComplexRefData& rRef ) const override { - ScRange aAbsRef = rRef.toAbs(rPos); + ScRange aAbsRef = rRef.toAbs(rLimits, rPos); ConventionXL::makeExternalDocStr(rBuffer, rFileName); ConventionXL::makeExternalTabNameRange(rBuffer, rTabName, rTabNames, aAbsRef); rBuffer.append('!'); - if (!ValidCol(aAbsRef.aEnd.Col()) || !ValidRow(aAbsRef.aEnd.Row())) + if (!rLimits.ValidCol(aAbsRef.aEnd.Col()) || !rLimits.ValidRow(aAbsRef.aEnd.Row())) { rBuffer.append(ScResId(STR_NO_REF_TABLE)); return; @@ -3183,7 +3192,7 @@ bool ScCompiler::IsDoubleReference( const OUString& rName, const OUString* pErrR if ( !(nFlags & ScRefFlags::TAB2_VALID) ) aRef.Ref2.SetTabDeleted( true ); // #REF! aRef.Ref2.SetFlag3D( ( nFlags & ScRefFlags::TAB2_3D ) != ScRefFlags::ZERO ); - aRef.SetRange(aRange, aPos); + aRef.SetRange(pDoc->GetSheetLimits(), aRange, aPos); if (aExtInfo.mbExternal) { ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager(); @@ -3249,7 +3258,7 @@ bool ScCompiler::IsSingleReference( const OUString& rName, const OUString* pErrR aRef.SetTabDeleted(true); nFlags |= ScRefFlags::VALID; } - aRef.SetAddress(aAddr, aPos); + aRef.SetAddress(pDoc->GetSheetLimits(), aAddr, aPos); if (aExtInfo.mbExternal) { @@ -3583,7 +3592,7 @@ bool ScCompiler::IsColRowName( const OUString& rName ) aRef.SetColRel( true ); // ColName else aRef.SetRowRel( true ); // RowName - aRef.SetAddress(aIter.GetPos(), aPos); + aRef.SetAddress(pDoc->GetSheetLimits(), aIter.GetPos(), aPos); bInList = bFound = true; } } @@ -3765,7 +3774,7 @@ bool ScCompiler::IsColRowName( const OUString& rName ) aRef.SetRowRel( true ); // RowName else aRef.SetColRel( true ); // ColName - aRef.SetAddress(aAdr, aPos); + aRef.SetAddress(pDoc->GetSheetLimits(), aAdr, aPos); } } if ( bFound ) @@ -5011,7 +5020,7 @@ void ScCompiler::CreateStringFromExternal( OUStringBuffer& rBuffer, const Formul rBuffer.append(pConv->makeExternalNameStr( nFileId, *pFileName, t->GetString().getString())); break; case svExternalSingleRef: - pConv->makeExternalRefStr( + pConv->makeExternalRefStr(pDoc->GetSheetLimits(), rBuffer, GetPos(), nFileId, *pFileName, t->GetString().getString(), *t->GetSingleRef()); break; @@ -5118,7 +5127,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu aRef.Ref1 = aRef.Ref2 = rRef; if ( eOp == ocColRowName ) { - ScAddress aAbs = rRef.toAbs(aPos); + ScAddress aAbs = rRef.toAbs(pDoc, aPos); if (pDoc->HasStringData(aAbs.Col(), aAbs.Row(), aAbs.Tab())) { OUString aStr = pDoc->GetString(aAbs, mpInterpreterContext); @@ -5135,7 +5144,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu else if (pArr && (p = maArrIterator.PeekPrevNoSpaces()) && p->GetOpCode() == ocTableRefOpen) { OUString aStr; - ScAddress aAbs = rRef.toAbs(aPos); + ScAddress aAbs = rRef.toAbs(pDoc, aPos); const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab(), ScDBDataPortion::AREA); SAL_WARN_IF( !pData, "sc.core", "ScCompiler::CreateStringFromSingleRef - TableRef without ScDBData: " << aAbs.Format( ScRefFlags::VALID | ScRefFlags::TAB_3D, pDoc)); @@ -5323,8 +5332,8 @@ void ScCompiler::fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry bool ScCompiler::HandleColRowName() { ScSingleRefData& rRef = *mpToken->GetSingleRef(); - const ScAddress aAbs = rRef.toAbs(aPos); - if (!ValidAddress(aAbs)) + const ScAddress aAbs = rRef.toAbs(pDoc, aPos); + if (!pDoc->ValidAddress(aAbs)) { SetError( FormulaError::NoRef ); return true; @@ -5497,7 +5506,7 @@ bool ScCompiler::HandleColRowName() aRefData.SetColRel( true ); else aRefData.SetRowRel( true ); - aRefData.SetAddress(aRange.aStart, aPos); + aRefData.SetAddress(pDoc->GetSheetLimits(), aRange.aStart, aPos); pNew->AddSingleReference( aRefData ); } else @@ -5514,7 +5523,7 @@ bool ScCompiler::HandleColRowName() aRefData.Ref1.SetRowRel( true ); aRefData.Ref2.SetRowRel( true ); } - aRefData.SetRange(aRange, aPos); + aRefData.SetRange(pDoc->GetSheetLimits(), aRange, aPos); if ( bInList ) pNew->AddDoubleReference( aRefData ); else @@ -5543,7 +5552,7 @@ bool ScCompiler::HandleDbData() ScRange aRange; pDBData->GetArea(aRange); aRange.aEnd.SetTab(aRange.aStart.Tab()); - aRefData.SetRange(aRange, aPos); + aRefData.SetRange(pDoc->GetSheetLimits(), aRange, aPos); ScTokenArray* pNew = new ScTokenArray(pDoc); pNew->AddDoubleReference( aRefData ); PushTokenArray( pNew, true ); @@ -5760,7 +5769,7 @@ bool ScCompiler::HandleTableRef() { case svSingleRef: { - aColRange.aStart = aColRange.aEnd = mpToken->GetSingleRef()->toAbs( aPos); + aColRange.aStart = aColRange.aEnd = mpToken->GetSingleRef()->toAbs(pDoc, aPos); if ( GetTokenIfOpCode( ocTableRefClose) && (nLevel--) && GetTokenIfOpCode( ocRange) && GetTokenIfOpCode( ocTableRefOpen) && (++nLevel) && @@ -5770,7 +5779,7 @@ bool ScCompiler::HandleTableRef() aColRange = ScRange( ScAddress::INITIALIZE_INVALID); else { - aColRange.aEnd = mpToken->GetSingleRef()->toAbs( aPos); + aColRange.aEnd = mpToken->GetSingleRef()->toAbs(pDoc, aPos); aColRange.PutInOrder(); bCol2Rel = mpToken->GetSingleRef()->IsColRel(); bCol2RelName = mpToken->GetSingleRef()->IsRelName(); @@ -5807,13 +5816,13 @@ bool ScCompiler::HandleTableRef() aRefData.SetFlag3D( true); if (nError != FormulaError::NONE) { - aRefData.SetAddress( aRange.aStart, aRange.aStart); + aRefData.SetAddress( pDoc->GetSheetLimits(), aRange.aStart, aRange.aStart); pTR->SetAreaRefRPN( new ScSingleRefToken(pDoc->GetSheetLimits(), aRefData)); // set reference at TableRef pNew->Add( new FormulaErrorToken( nError)); // set error in RPN } else { - aRefData.SetAddress( aRange.aStart, aPos); + aRefData.SetAddress( pDoc->GetSheetLimits(), aRange.aStart, aPos); pTR->SetAreaRefRPN( pNew->AddSingleReference( aRefData)); } } @@ -5836,13 +5845,13 @@ bool ScCompiler::HandleTableRef() aRefData.Ref1.SetFlag3D( true); if (nError != FormulaError::NONE) { - aRefData.SetRange( aRange, aRange.aStart); + aRefData.SetRange( pDoc->GetSheetLimits(), aRange, aRange.aStart); pTR->SetAreaRefRPN( new ScDoubleRefToken(pDoc->GetSheetLimits(), aRefData)); // set reference at TableRef pNew->Add( new FormulaErrorToken( nError)); // set error in RPN } else { - aRefData.SetRange( aRange, aPos); + aRefData.SetRange( pDoc->GetSheetLimits(), aRange, aPos); pTR->SetAreaRefRPN( pNew->AddDoubleReference( aRefData)); } } @@ -6078,7 +6087,7 @@ void ScCompiler::ReplaceDoubleRefII(FormulaToken** ppDoubleRefTok) if (!rRange.Ref1.IsRowRel() && !rRange.Ref2.IsRowRel()) return; - ScRange aAbsRange = rRange.toAbs(aPos); + ScRange aAbsRange = rRange.toAbs(pDoc, aPos); if (aAbsRange.aStart == aAbsRange.aEnd) return; // Nothing to do (trivial case). @@ -6092,7 +6101,7 @@ void ScCompiler::ReplaceDoubleRefII(FormulaToken** ppDoubleRefTok) aSingleRef.SetColRel(rRange.Ref1.IsColRel()); aSingleRef.SetRowRel(true); aSingleRef.SetTabRel(rRange.Ref1.IsTabRel()); - aSingleRef.SetAddress(aAddr, aPos); + aSingleRef.SetAddress(pDoc->GetSheetLimits(), aAddr, aPos); // Replace the original doubleref token with computed singleref token FormulaToken* pNewSingleRefTok = new ScSingleRefToken(pDoc->GetSheetLimits(), aSingleRef); @@ -6168,7 +6177,7 @@ static void lcl_GetColRowDeltas(const ScRange& rRange, SCCOL& rXDelta, SCROW& rY bool ScCompiler::AdjustSumRangeShape(const ScComplexRefData& rBaseRange, ScComplexRefData& rSumRange) { - ScRange aAbs = rSumRange.toAbs(aPos); + ScRange aAbs = rSumRange.toAbs(pDoc, aPos); // Current sum-range end col/row SCCOL nEndCol = aAbs.aEnd.Col(); @@ -6177,7 +6186,7 @@ bool ScCompiler::AdjustSumRangeShape(const ScComplexRefData& rBaseRange, ScCompl // Current behaviour is, we will get a #NAME? for the below case, so bail out. // Note that sum-range's End[Col,Row] are same as Start[Col,Row] if the original formula // has a single-ref as the sum-range. - if (!ValidCol(nEndCol) || !ValidRow(nEndRow)) + if (!pDoc->ValidCol(nEndCol) || !pDoc->ValidRow(nEndRow)) return false; SCCOL nXDeltaSum = 0; @@ -6185,7 +6194,7 @@ bool ScCompiler::AdjustSumRangeShape(const ScComplexRefData& rBaseRange, ScCompl lcl_GetColRowDeltas(aAbs, nXDeltaSum, nYDeltaSum); - aAbs = rBaseRange.toAbs(aPos); + aAbs = rBaseRange.toAbs(pDoc, aPos); SCCOL nXDelta = 0; SCROW nYDelta = 0; diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index bb8647e5e401..d134a9e45cec 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -474,7 +474,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, { // insert reference (absolute, 3d) - aSRef.SetAddress(ScAddress(aRef.nCol,aRef.nRow,aRef.nTab), ScAddress()); + aSRef.SetAddress(pDestDoc->GetSheetLimits(), ScAddress(aRef.nCol,aRef.nRow,aRef.nTab), ScAddress()); ScTokenArray aRefArr(pDestDoc); aRefArr.AddSingleReference(aSRef); @@ -493,7 +493,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, ScRange aRange(sal::static_int_cast<SCCOL>(nCol+nArrX), nRow+nArrY, nTab); aRange.aEnd.SetRow(nRow+nArrY+nNeeded-1); - aCRef.SetRange(aRange, aDest); + aCRef.SetRange(pDestDoc->GetSheetLimits(), aRange, aDest); ScTokenArray aArr(pDestDoc); aArr.AddOpCode(eOpCode); // selected function diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 045998d7cdf8..ac1af287d1a5 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1400,7 +1400,7 @@ void ScDetectiveFunc::GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n { const ScAddress& aPos = aIter.GetPos(); ScTokenRef pRef(p->Clone()); - if (ScRefTokenHelper::intersects(aSrcRange, pRef, aPos)) + if (ScRefTokenHelper::intersects(pDoc, aSrcRange, pRef, aPos)) { // This address is absolute. pRef = ScRefTokenHelper::createRefToken(pDoc, aPos); diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index a2a464b6813f..2a2316a0c173 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -46,6 +46,7 @@ void lcl_uppercase(OUString& rStr) } bool lcl_createStarQuery( + const ScDocument* pDoc, svl::SharedStringPool& rPool, ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef) { // A valid StarQuery must be at least 4 columns wide. To be precise it @@ -96,7 +97,7 @@ bool lcl_createStarQuery( // field name in the 2nd column. aCellStr = pQueryRef->getString(1, nRow); SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison. - if (ValidCol(nField)) + if (pDoc->ValidCol(nField)) { rEntry.nField = nField; bValid = true; @@ -147,6 +148,7 @@ bool lcl_createStarQuery( } bool lcl_createExcelQuery( + const ScDocument* pDoc, svl::SharedStringPool& rPool, ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef) { bool bValid = true; @@ -158,7 +160,7 @@ bool lcl_createExcelQuery( { OUString aQueryStr = pQueryRef->getString(nCol, 0); SCCOL nField = pDBRef->findFieldColumn(aQueryStr); - if (ValidCol(nField)) + if (pDoc->ValidCol(nField)) aFields[nCol] = nField; else bValid = false; @@ -213,6 +215,7 @@ bool lcl_createExcelQuery( } bool lcl_fillQueryEntries( + const ScDocument* pDoc, svl::SharedStringPool& rPool, ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef) { SCSIZE nCount = pParam->GetEntryCount(); @@ -220,10 +223,10 @@ bool lcl_fillQueryEntries( pParam->GetEntry(i).Clear(); // Standard QueryTabelle - bool bValid = lcl_createStarQuery(rPool, pParam, pDBRef, pQueryRef); + bool bValid = lcl_createStarQuery(pDoc, rPool, pParam, pDBRef, pQueryRef); // Excel QueryTabelle if (!bValid) - bValid = lcl_createExcelQuery(rPool, pParam, pDBRef, pQueryRef); + bValid = lcl_createExcelQuery(pDoc, rPool, pParam, pDBRef, pQueryRef); nCount = pParam->GetEntryCount(); if (bValid) @@ -257,7 +260,7 @@ bool ScDBRangeBase::fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBa if (!pDBRef) return false; - return lcl_fillQueryEntries(getDoc()->GetSharedStringPool(), pParam, pDBRef, this); + return lcl_fillQueryEntries(getDoc(), getDoc()->GetSharedStringPool(), pParam, pDBRef, this); } void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 5340d622e9b4..388ed68f14ed 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4263,7 +4263,7 @@ void ScInterpreter::ScColumns() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1) * static_cast<sal_uLong>(aAbs.aEnd.Col() - aAbs.aStart.Col() + 1); } @@ -4320,7 +4320,7 @@ void ScInterpreter::ScRows() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1) * static_cast<sal_uLong>(aAbs.aEnd.Row() - aAbs.aStart.Row() + 1); } @@ -4367,7 +4367,7 @@ void ScInterpreter::ScSheets() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1); } break; @@ -4431,7 +4431,7 @@ void ScInterpreter::ScColumn() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef( nFileId, aTabName, aRef ); - ScAddress aAbsRef = aRef.toAbs(aPos); + ScAddress aAbsRef = aRef.toAbs(pDok, aPos); nVal = static_cast<double>( aAbsRef.Col() + 1 ); } break; @@ -4455,7 +4455,7 @@ void ScInterpreter::ScColumn() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef ); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nCol1 = aAbs.aStart.Col(); nCol2 = aAbs.aEnd.Col(); } @@ -4535,7 +4535,7 @@ void ScInterpreter::ScRow() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef( nFileId, aTabName, aRef ); - ScAddress aAbsRef = aRef.toAbs(aPos); + ScAddress aAbsRef = aRef.toAbs(pDok, aPos); nVal = static_cast<double>( aAbsRef.Row() + 1 ); } break; @@ -4558,7 +4558,7 @@ void ScInterpreter::ScRow() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef ); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nRow1 = aAbs.aStart.Row(); nRow2 = aAbs.aEnd.Row(); } @@ -8375,7 +8375,7 @@ void ScInterpreter::ScOffset() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef(nFileId, aTabName, aRef); - ScAddress aAbsRef = aRef.toAbs(aPos); + ScAddress aAbsRef = aRef.toAbs(pDok, aPos); nCol1 = aAbsRef.Col(); nRow1 = aAbsRef.Row(); nTab1 = aAbsRef.Tab(); @@ -8432,7 +8432,7 @@ void ScInterpreter::ScOffset() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef(nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(aPos); + ScRange aAbs = aRef.toAbs(pDok, aPos); nCol1 = aAbs.aStart.Col(); nRow1 = aAbs.aStart.Row(); nTab1 = aAbs.aStart.Tab(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 43bf4f75da07..2dc9010e8eed 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2465,12 +2465,12 @@ void ScInterpreter::ScIntersect() ScRefList* pRefList = xRes->GetRefList(); for (const auto& rRef1 : *x1->GetRefList()) { - const ScAddress& r11 = rRef1.Ref1.toAbs(aPos); - const ScAddress& r12 = rRef1.Ref2.toAbs(aPos); + const ScAddress& r11 = rRef1.Ref1.toAbs(pDok, aPos); + const ScAddress& r12 = rRef1.Ref2.toAbs(pDok, aPos); for (const auto& rRef2 : *x2->GetRefList()) { - const ScAddress& r21 = rRef2.Ref1.toAbs(aPos); - const ScAddress& r22 = rRef2.Ref2.toAbs(aPos); + const ScAddress& r21 = rRef2.Ref1.toAbs(pDok, aPos); + const ScAddress& r22 = rRef2.Ref2.toAbs(pDok, aPos); SCCOL nCol1 = ::std::max( r11.Col(), r21.Col()); SCROW nRow1 = ::std::max( r11.Row(), r21.Row()); SCTAB nTab1 = ::std::max( r11.Tab(), r21.Tab()); @@ -2516,14 +2516,14 @@ void ScInterpreter::ScIntersect() case svDoubleRef: { { - const ScAddress& r = pt[i]->GetSingleRef()->toAbs(aPos); + const ScAddress& r = pt[i]->GetSingleRef()->toAbs(pDok, aPos); nC1[i] = r.Col(); nR1[i] = r.Row(); nT1[i] = r.Tab(); } if (sv[i] == svDoubleRef) { - const ScAddress& r = pt[i]->GetSingleRef2()->toAbs(aPos); + const ScAddress& r = pt[i]->GetSingleRef2()->toAbs(pDok, aPos); nC2[i] = r.Col(); nR2[i] = r.Row(); nT2[i] = r.Tab(); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 8a7143fb94ef..1a371f3f3381 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -878,12 +878,12 @@ void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, else rTab = rRef.Tab(); - if( !ValidCol( rCol) || rRef.IsColDeleted() ) + if( !pDok->ValidCol( rCol) || rRef.IsColDeleted() ) { SetError( FormulaError::NoRef ); rCol = 0; } - if( !ValidRow( rRow) || rRef.IsRowDeleted() ) + if( !pDok->ValidRow( rRow) || rRef.IsRowDeleted() ) { SetError( FormulaError::NoRef ); rRow = 0; @@ -1178,7 +1178,7 @@ void ScInterpreter::PopExternalSingleRef( return; } - ScAddress aAddr = rRef.toAbs(aPos); + ScAddress aAddr = rRef.toAbs(pDok, aPos); ScExternalRefCache::CellFormat aFmt; ScExternalRefCache::TokenRef xNew = pRefMgr->getSingleRefToken( rFileId, rTabName, aAddr, &aPos, nullptr, &aFmt); @@ -1279,8 +1279,8 @@ void ScInterpreter::GetExternalDoubleRef( } ScComplexRefData aData(rData); - ScRange aRange = aData.toAbs(aPos); - if (!ValidColRow(aRange.aStart.Col(), aRange.aStart.Row()) || !ValidColRow(aRange.aEnd.Col(), aRange.aEnd.Row())) + ScRange aRange = aData.toAbs(pDok, aPos); + if (!pDok->ValidColRow(aRange.aStart.Col(), aRange.aStart.Row()) || !pDok->ValidColRow(aRange.aEnd.Col(), aRange.aEnd.Row())) { SetError(FormulaError::NoRef); return; @@ -1858,7 +1858,7 @@ void ScInterpreter::PushSingleRef( const ScRefAddress& rRef ) if (!IfErrorPushError()) { ScSingleRefData aRef; - aRef.InitFromRefAddress( rRef, aPos); + aRef.InitFromRefAddress( pDok, rRef, aPos); PushTempTokenWithoutError( new ScSingleRefToken( pDok->GetSheetLimits(), aRef ) ); } } @@ -1868,7 +1868,7 @@ void ScInterpreter::PushDoubleRef( const ScRefAddress& rRef1, const ScRefAddress if (!IfErrorPushError()) { ScComplexRefData aRef; - aRef.InitFromRefAddresses( rRef1, rRef2, aPos); + aRef.InitFromRefAddresses( pDok, rRef1, rRef2, aPos); PushTempTokenWithoutError( new ScDoubleRefToken( pDok->GetSheetLimits(), aRef ) ); } } @@ -3665,7 +3665,7 @@ void ScInterpreter::ScDBArea() ScRange aRange; pDBData->GetArea(aRange); aRange.aEnd.SetTab(aRange.aStart.Tab()); - aRefData.SetRange(aRange, aPos); + aRefData.SetRange(pDok->GetSheetLimits(), aRange, aPos); PushTempToken( new ScDoubleRefToken( pDok->GetSheetLimits(), aRefData ) ); } else @@ -3675,8 +3675,8 @@ void ScInterpreter::ScDBArea() void ScInterpreter::ScColRowNameAuto() { ScComplexRefData aRefData( *pCur->GetDoubleRef() ); - ScRange aAbs = aRefData.toAbs(aPos); - if (!ValidRange(aAbs)) + ScRange aAbs = aRefData.toAbs(pDok, aPos); + if (!pDok->ValidRange(aAbs)) { PushError( FormulaError::NoRef ); return; @@ -3749,7 +3749,7 @@ void ScInterpreter::ScColRowNameAuto() } } } - aRefData.SetRange(aAbs, aPos); + aRefData.SetRange(pDok->GetSheetLimits(), aAbs, aPos); PushTempToken( new ScDoubleRefToken( pDok->GetSheetLimits(), aRefData ) ); } diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 6b8c2098a305..7e6a8daebdcf 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -292,10 +292,10 @@ void ScRangeData::UpdateTranspose( const ScRange& rSource, const ScAddress& rDes (!rRef.Ref2.IsColRel() && !rRef.Ref2.IsRowRel() && (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel())))) { - ScRange aAbs = rRef.toAbs(aPos); + ScRange aAbs = rRef.toAbs(pDoc, aPos); if (ScRefUpdate::UpdateTranspose(pDoc, rSource, rDest, aAbs) != UR_NOTHING) { - rRef.SetRange(aAbs, aPos); + rRef.SetRange(pDoc->GetSheetLimits(), aAbs, aPos); bChanged = true; } } @@ -324,10 +324,10 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) (!rRef.Ref2.IsColRel() && !rRef.Ref2.IsRowRel() && (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel())))) { - ScRange aAbs = rRef.toAbs(aPos); + ScRange aAbs = rRef.toAbs(pDoc, aPos); if (ScRefUpdate::UpdateGrow(rArea, nGrowX, nGrowY, aAbs) != UR_NOTHING) { - rRef.SetRange(aAbs, aPos); + rRef.SetRange(pDoc->GetSheetLimits(), aAbs, aPos); bChanged = true; } } @@ -533,7 +533,7 @@ void ScRangeData::ValidateTabRefs() while ( ( t = aIter.GetNextReference() ) != nullptr ) { ScSingleRefData& rRef1 = *t->GetSingleRef(); - ScAddress aAbs = rRef1.toAbs(aPos); + ScAddress aAbs = rRef1.toAbs(pDoc, aPos); if ( rRef1.IsTabRel() && !rRef1.IsTabDeleted() ) { if (aAbs.Tab() < nMinTab) @@ -544,7 +544,7 @@ void ScRangeData::ValidateTabRefs() if ( t->GetType() == svDoubleRef ) { ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2; - aAbs = rRef2.toAbs(aPos); + aAbs = rRef2.toAbs(pDoc, aPos); if ( rRef2.IsTabRel() && !rRef2.IsTabDeleted() ) { if (aAbs.Tab() < nMinTab) @@ -575,8 +575,8 @@ void ScRangeData::ValidateTabRefs() ScSingleRefData& rRef = *t->GetSingleRef(); if (!rRef.IsTabDeleted()) { - ScAddress aAbs = rRef.toAbs(aOldPos); - rRef.SetAddress(aAbs, aPos); + ScAddress aAbs = rRef.toAbs(pDoc, aOldPos); + rRef.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos); } } break; @@ -585,13 +585,13 @@ void ScRangeData::ValidateTabRefs() ScComplexRefData& rRef = *t->GetDoubleRef(); if (!rRef.Ref1.IsTabDeleted()) { - ScAddress aAbs = rRef.Ref1.toAbs(aOldPos); - rRef.Ref1.SetAddress(aAbs, aPos); + ScAddress aAbs = rRef.Ref1.toAbs(pDoc, aOldPos); + rRef.Ref1.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos); } if (!rRef.Ref2.IsTabDeleted()) { - ScAddress aAbs = rRef.Ref2.toAbs(aOldPos); - rRef.Ref2.SetAddress(aAbs, aPos); + ScAddress aAbs = rRef.Ref2.toAbs(pDoc, aOldPos); + rRef.Ref2.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos); } } break; diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 3d9bfd29818e..9458ff546438 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -37,23 +37,23 @@ void ScSingleRefData::InitAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) mnTab = nTabP; } -void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ) +void ScSingleRefData::InitAddressRel( const ScDocument* pDoc, const ScAddress& rAdr, const ScAddress& rPos ) { InitFlags(); SetColRel(true); SetRowRel(true); SetTabRel(true); - SetAddress(rAdr, rPos); + SetAddress(pDoc->GetSheetLimits(), rAdr, rPos); } -void ScSingleRefData::InitFromRefAddress( const ScRefAddress& rRef, const ScAddress& rPos ) +void ScSingleRefData::InitFromRefAddress( const ScDocument* pDoc, const ScRefAddress& rRef, const ScAddress& rPos ) { InitFlags(); SetColRel( rRef.IsRelCol()); SetRowRel( rRef.IsRelRow()); SetTabRel( rRef.IsRelTab()); SetFlag3D( rRef.Tab() != rPos.Tab()); - SetAddress( rRef.GetAddress(), rPos); + SetAddress( pDoc->GetSheetLimits(), rRef.GetAddress(), rPos); } void ScSingleRefData::SetAbsCol( SCCOL nVal ) @@ -185,27 +185,12 @@ bool ScSingleRefData::ValidExternal(const ScDocument* pDoc) const return ColValid(pDoc) && RowValid(pDoc) && mnTab >= -1; } -ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) const +ScAddress ScSingleRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos ) const { - SCCOL nRetCol = Flags.bColRel ? mnCol + rPos.Col() : mnCol; - SCROW nRetRow = Flags.bRowRel ? mnRow + rPos.Row() : mnRow; - SCTAB nRetTab = Flags.bTabRel ? mnTab + rPos.Tab() : mnTab; - - ScAddress aAbs(ScAddress::INITIALIZE_INVALID); - - if (ValidCol(nRetCol)) - aAbs.SetCol(nRetCol); - - if (ValidRow(nRetRow)) - aAbs.SetRow(nRetRow); - - if (ValidTab(nRetTab)) - aAbs.SetTab(nRetTab); - - return aAbs; + return toAbs(pDoc->GetSheetLimits(), rPos); } -ScAddress ScSingleRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos ) const +ScAddress ScSingleRefData::toAbs( ScSheetLimits& rLimits, const ScAddress& rPos ) const { SCCOL nRetCol = Flags.bColRel ? mnCol + rPos.Col() : mnCol; SCROW nRetRow = Flags.bRowRel ? mnRow + rPos.Row() : mnRow; @@ -213,10 +198,10 @@ ScAddress ScSingleRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos ScAddress aAbs(ScAddress::INITIALIZE_INVALID); - if (pDoc->ValidCol(nRetCol)) + if (rLimits.ValidCol(nRetCol)) aAbs.SetCol(nRetCol); - if (pDoc->ValidRow(nRetRow)) + if (rLimits.ValidRow(nRetRow)) aAbs.SetRow(nRetRow); if (ValidTab(nRetTab)) @@ -225,41 +210,14 @@ ScAddress ScSingleRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos return aAbs; } -void ScSingleRefData::SetAddress( const ScAddress& rAddr, const ScAddress& rPos ) -{ - if (Flags.bColRel) - mnCol = rAddr.Col() - rPos.Col(); - else - mnCol = rAddr.Col(); - - if (!ValidCol(rAddr.Col())) - SetColDeleted(true); - - if (Flags.bRowRel) - mnRow = rAddr.Row() - rPos.Row(); - else - mnRow = rAddr.Row(); - - if (!ValidRow(rAddr.Row())) - SetRowDeleted(true); - - if (Flags.bTabRel) - mnTab = rAddr.Tab() - rPos.Tab(); - else - mnTab = rAddr.Tab(); - - if (!ValidTab( rAddr.Tab(), MAXTAB)) - SetTabDeleted(true); -} - -void ScSingleRefData::SetAddress( const ScDocument* pDoc, const ScAddress& rAddr, const ScAddress& rPos ) +void ScSingleRefData::SetAddress( ScSheetLimits& rLimits, const ScAddress& rAddr, const ScAddress& rPos ) { if (Flags.bColRel) mnCol = rAddr.Col() - rPos.Col(); else mnCol = rAddr.Col(); - if (!pDoc->ValidCol(rAddr.Col())) + if (!rLimits.ValidCol(rAddr.Col())) SetColDeleted(true); if (Flags.bRowRel) @@ -267,7 +225,7 @@ void ScSingleRefData::SetAddress( const ScDocument* pDoc, const ScAddress& rAddr else mnRow = rAddr.Row(); - if (!pDoc->ValidRow(rAddr.Row())) + if (!rLimits.ValidRow(rAddr.Row())) SetRowDeleted(true); if (Flags.bTabRel) @@ -419,7 +377,7 @@ void ScSingleRefData::Dump( int nIndent ) const } #endif -void ScComplexRefData::InitFromRefAddresses( const ScRefAddress& rRef1, const ScRefAddress& rRef2, const ScAddress& rPos ) +void ScComplexRefData::InitFromRefAddresses( const ScDocument* pDoc, const ScRefAddress& rRef1, const ScRefAddress& rRef2, const ScAddress& rPos ) { InitFlags(); Ref1.SetColRel( rRef1.IsRelCol()); @@ -430,13 +388,13 @@ void ScComplexRefData::InitFromRefAddresses( const ScRefAddress& rRef1, const Sc Ref2.SetRowRel( rRef2.IsRelRow()); Ref2.SetTabRel( rRef2.IsRelTab()); Ref2.SetFlag3D( rRef1.Tab() != rRef2.Tab()); - SetRange( ScRange( rRef1.GetAddress(), rRef2.GetAddress()), rPos); + SetRange( pDoc->GetSheetLimits(), ScRange( rRef1.GetAddress(), rRef2.GetAddress()), rPos); } -ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const ScAddress & rPos ) +ScComplexRefData& ScComplexRefData::Extend( ScSheetLimits& rLimits, const ScSingleRefData & rRef, const ScAddress & rPos ) { bool bInherit3D = (Ref1.IsFlag3D() && !Ref2.IsFlag3D() && !rRef.IsFlag3D()); - ScRange aAbsRange = toAbs(rPos); + ScRange aAbsRange = toAbs(rLimits, rPos); ScSingleRefData aRef = rRef; // If no sheet was given in the extending part, let it point to the same @@ -450,7 +408,7 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const else aRef.SetAbsTab( Ref2.Tab()); } - ScAddress aAbs = aRef.toAbs(rPos); + ScAddress aAbs = aRef.toAbs(rLimits, rPos); if (aAbs.Col() < aAbsRange.aStart.Col()) aAbsRange.aStart.SetCol(aAbs.Col()); @@ -507,14 +465,14 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const if (rRef.IsRelName()) Ref2.SetRelName(true); - SetRange(aAbsRange, rPos); + SetRange(rLimits, aAbsRange, rPos); return *this; } -ScComplexRefData& ScComplexRefData::Extend( const ScComplexRefData & rRef, const ScAddress & rPos ) +ScComplexRefData& ScComplexRefData::Extend( ScSheetLimits& rLimits, const ScComplexRefData & rRef, const ScAddress & rPos ) { - return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos); + return Extend( rLimits, rRef.Ref1, rPos).Extend( rLimits, rRef.Ref2, rPos); } bool ScComplexRefData::Valid(const ScDocument* pDoc) const @@ -527,20 +485,20 @@ bool ScComplexRefData::ValidExternal(const ScDocument* pDoc) const return Ref1.ValidExternal(pDoc) && Ref2.ColValid(pDoc) && Ref2.RowValid(pDoc) && Ref1.Tab() <= Ref2.Tab(); } -ScRange ScComplexRefData::toAbs( const ScAddress& rPos ) const +ScRange ScComplexRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos ) const { - return ScRange(Ref1.toAbs(rPos), Ref2.toAbs(rPos)); + return toAbs(pDoc->GetSheetLimits(), rPos); } -ScRange ScComplexRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos ) const +ScRange ScComplexRefData::toAbs( ScSheetLimits& rLimits, const ScAddress& rPos ) const { - return ScRange(Ref1.toAbs(pDoc, rPos), Ref2.toAbs(pDoc, rPos)); + return ScRange(Ref1.toAbs(rLimits, rPos), Ref2.toAbs(rLimits, rPos)); } -void ScComplexRefData::SetRange( const ScRange& rRange, const ScAddress& rPos ) +void ScComplexRefData::SetRange( ScSheetLimits& rLimits, const ScRange& rRange, const ScAddress& rPos ) { - Ref1.SetAddress(rRange.aStart, rPos); - Ref2.SetAddress(rRange.aEnd, rPos); + Ref1.SetAddress(rLimits, rRange.aStart, rPos); + Ref2.SetAddress(rLimits, rRange.aEnd, rPos); } void ScComplexRefData::PutInOrder( const ScAddress& rPos ) diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx index 15341e92f930..222b1bb3e211 100644 --- a/sc/source/core/tool/reftokenhelper.cxx +++ b/sc/source/core/tool/reftokenhelper.cxx @@ -121,6 +121,7 @@ void ScRefTokenHelper::compileRangeRepresentation( } bool ScRefTokenHelper::getRangeFromToken( + const ScDocument* pDoc, ScRange& rRange, const ScTokenRef& pToken, const ScAddress& rPos, bool bExternal) { StackVar eType = pToken->GetType(); @@ -134,7 +135,7 @@ bool ScRefTokenHelper::getRangeFromToken( return false; const ScSingleRefData& rRefData = *pToken->GetSingleRef(); - rRange.aStart = rRefData.toAbs(rPos); + rRange.aStart = rRefData.toAbs(pDoc, rPos); rRange.aEnd = rRange.aStart; return true; } @@ -146,7 +147,7 @@ bool ScRefTokenHelper::getRangeFromToken( return false; const ScComplexRefData& rRefData = *pToken->GetDoubleRef(); - rRange = rRefData.toAbs(rPos); + rRange = rRefData.toAbs(pDoc, rPos); return true; } default: @@ -156,12 +157,12 @@ bool ScRefTokenHelper::getRangeFromToken( } void ScRefTokenHelper::getRangeListFromTokens( - ScRangeList& rRangeList, const vector<ScTokenRef>& rTokens, const ScAddress& rPos) + const ScDocument* pDoc, ScRangeList& rRangeList, const vector<ScTokenRef>& rTokens, const ScAddress& rPos) { for (const auto& rToken : rTokens) { ScRange aRange; - getRangeFromToken(aRange, rToken, rPos); + getRangeFromToken(pDoc, aRange, rToken, rPos); rRangeList.push_back(aRange); } } @@ -223,6 +224,7 @@ bool ScRefTokenHelper::isExternalRef(const ScTokenRef& pToken) } bool ScRefTokenHelper::intersects( + const ScDocument* pDoc, const vector<ScTokenRef>& rTokens, const ScTokenRef& pToken, const ScAddress& rPos) { if (!isRef(pToken)) @@ -232,7 +234,7 @@ bool ScRefTokenHelper::intersects( sal_uInt16 nFileId = bExternal ? pToken->GetIndex() : 0; ScRange aRange; - getRangeFromToken(aRange, pToken, rPos, bExternal); + getRangeFromToken(pDoc, aRange, pToken, rPos, bExternal); for (const ScTokenRef& p : rTokens) { @@ -243,7 +245,7 @@ bool ScRefTokenHelper::intersects( continue; ScRange aRange2; - getRangeFromToken(aRange2, p, rPos, bExternal); + getRangeFromToken(pDoc, aRange2, p, rPos, bExternal); if (bExternal && nFileId != p->GetIndex()) // different external file @@ -341,7 +343,7 @@ private: if (!ScRefTokenHelper::getDoubleRefDataFromToken(aOldData, pOldToken)) continue; - ScRange aOld = aOldData.toAbs(rPos), aNew = aData.toAbs(rPos); + ScRange aOld = aOldData.toAbs(pDoc, rPos), aNew = aData.toAbs(pDoc, rPos); if (aNew.aStart.Tab() != aOld.aStart.Tab() || aNew.aEnd.Tab() != aOld.aEnd.Tab()) // Sheet ranges differ. @@ -366,7 +368,7 @@ private: { aNew.aStart.SetCol(nNewMin); aNew.aEnd.SetCol(nNewMax); - aNewData.SetRange(aNew, rPos); + aNewData.SetRange(pDoc->GetSheetLimits(), aNew, rPos); } } else if (bSameCols) @@ -380,7 +382,7 @@ private: { aNew.aStart.SetRow(nNewMin); aNew.aEnd.SetRow(nNewMax); - aNewData.SetRange(aNew, rPos); + aNewData.SetRange(pDoc->GetSheetLimits(), aNew, rPos); } } diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index 9d1e290569e9..c1c1ffa19cd5 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -463,7 +463,7 @@ ScRefUpdateRes ScRefUpdate::Update( UpdateRefMode eUpdateRefMode, void ScRefUpdate::MoveRelWrap( const ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef ) { - ScRange aAbsRange = rRef.toAbs(rPos); + ScRange aAbsRange = rRef.toAbs(pDoc, rPos); if( rRef.Ref1.IsColRel() ) { SCCOL nCol = aAbsRange.aStart.Col(); @@ -503,7 +503,7 @@ void ScRefUpdate::MoveRelWrap( const ScDocument* pDoc, const ScAddress& rPos, } aAbsRange.PutInOrder(); - rRef.SetRange(aAbsRange, rPos); + rRef.SetRange(pDoc->GetSheetLimits(), aAbsRange, rPos); } void ScRefUpdate::DoTranspose( SCCOL& rCol, SCROW& rRow, SCTAB& rTab, diff --git a/sc/source/core/tool/sharedformula.cxx b/sc/source/core/tool/sharedformula.cxx index 7573534bdd86..35e93a4155b5 100644 --- a/sc/source/core/tool/sharedformula.cxx +++ b/sc/source/core/tool/sharedformula.cxx @@ -120,7 +120,7 @@ bool SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type return true; } -bool SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vector<SCROW>& rBounds) +bool SharedFormulaUtil::splitFormulaCellGroups(const ScDocument* pDoc, CellStoreType& rCells, std::vector<SCROW>& rBounds) { if (rBounds.empty()) return false; @@ -141,7 +141,7 @@ bool SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vecto for (++it; it != itEnd; ++it) { nRow = *it; - if (ValidRow(nRow)) + if (pDoc->ValidRow(nRow)) { aPos = rCells.position(aPos.first, nRow); if (aPos.first == rCells.end()) @@ -379,7 +379,7 @@ void SharedFormulaUtil::unshareFormulaCells(const ScDocument* pDoc, CellStoreTyp // Remove duplicates again (the vector should still be sorted). aRows2.erase(std::unique(aRows2.begin(), aRows2.end()), aRows2.end()); - splitFormulaCellGroups(rCells, aRows2); + splitFormulaCellGroups(pDoc, rCells, aRows2); } void SharedFormulaUtil::startListeningAsGroup( sc::StartListeningContext& rCxt, ScFormulaCell** ppSharedTop ) @@ -411,7 +411,7 @@ void SharedFormulaUtil::startListeningAsGroup( sc::StartListeningContext& rCxt, case formula::svSingleRef: { const ScSingleRefData* pRef = t->GetSingleRef(); - ScAddress aPos = pRef->toAbs(rTopCell.aPos); + ScAddress aPos = pRef->toAbs(&rDoc, rTopCell.aPos); ScFormulaCell** pp = ppSharedTop; ScFormulaCell** ppEnd = ppSharedTop + xGroup->mnLength; for (; pp != ppEnd; ++pp) @@ -429,8 +429,8 @@ void SharedFormulaUtil::startListeningAsGroup( sc::StartListeningContext& rCxt, { const ScSingleRefData& rRef1 = *t->GetSingleRef(); const ScSingleRefData& rRef2 = *t->GetSingleRef2(); - ScAddress aPos1 = rRef1.toAbs(rTopCell.aPos); - ScAddress aPos2 = rRef2.toAbs(rTopCell.aPos); + ScAddress aPos1 = rRef1.toAbs(&rDoc, rTopCell.aPos); + ScAddress aPos2 = rRef2.toAbs(&rDoc, rTopCell.aPos); ScRange aOrigRange(aPos1, aPos2); ScRange aListenedRange = aOrigRange; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 6fd70a6eaf23..1070fca89e23 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -428,7 +428,7 @@ FormulaToken* ScRawToken::CreateToken(ScSheetLimits& rLimits) const namespace { // TextEqual: if same formula entered (for optimization in sort) -bool checkTextEqual( const FormulaToken& _rToken1, const FormulaToken& _rToken2 ) +bool checkTextEqual( ScSheetLimits& rLimits, const FormulaToken& _rToken1, const FormulaToken& _rToken2 ) { assert( (_rToken1.GetType() == svSingleRef || _rToken1.GetType() == svDoubleRef) @@ -455,7 +455,7 @@ bool checkTextEqual( const FormulaToken& _rToken1, const FormulaToken& _rToken2 aTemp2 = *_rToken2.GetDoubleRef(); ScAddress aPos; - ScRange aRange1 = aTemp1.toAbs(aPos), aRange2 = aTemp2.toAbs(aPos); + ScRange aRange1 = aTemp1.toAbs(rLimits, aPos), aRange2 = aTemp2.toAbs(rLimits, aPos); // memcmp doesn't work because of the alignment byte after bFlags. // After SmartRelAbs only absolute parts have to be compared. @@ -545,7 +545,7 @@ FormulaTokenRef extendRangeReference( ScSheetLimits& rLimits, FormulaToken & rTo ScComplexRefData aRef; aRef.Ref1 = aRef.Ref2 = *rTok1.GetSingleRef(); aRef.Ref2.SetFlag3D( false); - aRef.Extend(rRef2, rPos); + aRef.Extend(rLimits, rRef2, rPos); if (bExternal) xRes = new ScExternalDoubleRefToken( rTok1.GetIndex(), rTok1.GetString(), aRef); else @@ -587,10 +587,10 @@ FormulaTokenRef extendRangeReference( ScSheetLimits& rLimits, FormulaToken & rTo switch (sv[i]) { case svSingleRef: - rRef.Extend(*pt[i]->GetSingleRef(), rPos); + rRef.Extend(rLimits, *pt[i]->GetSingleRef(), rPos); break; case svDoubleRef: - rRef.Extend(*pt[i]->GetDoubleRef(), rPos); + rRef.Extend(rLimits, *pt[i]->GetDoubleRef(), rPos); break; case svRefList: { @@ -599,7 +599,7 @@ FormulaTokenRef extendRangeReference( ScSheetLimits& rLimits, FormulaToken & rTo return nullptr; for (const auto& rRefData : *p) { - rRef.Extend(rRefData, rPos); + rRef.Extend(rLimits, rRefData, rPos); } } break; @@ -607,13 +607,13 @@ FormulaTokenRef extendRangeReference( ScSheetLimits& rLimits, FormulaToken & rTo if (rRef.Ref1.IsFlag3D() || rRef.Ref2.IsFlag3D()) return nullptr; // no other sheets with external refs else - rRef.Extend(*pt[i]->GetSingleRef(), rPos); + rRef.Extend(rLimits, *pt[i]->GetSingleRef(), rPos); break; case svExternalDoubleRef: if (rRef.Ref1.IsFlag3D() || rRef.Ref2.IsFlag3D()) return nullptr; // no other sheets with external refs else - rRef.Extend(*pt[i]->GetDoubleRef(), rPos); + rRef.Extend(rLimits, *pt[i]->GetDoubleRef(), rPos); break; default: ; // nothing, prevent compiler warning @@ -629,7 +629,7 @@ const ScSingleRefData* ScSingleRefToken::GetSingleRef() const { return &aSin ScSingleRefData* ScSingleRefToken::GetSingleRef() { return &aSingleRef; } bool ScSingleRefToken::TextEqual( const FormulaToken& _rToken ) const { - return FormulaToken::operator ==(_rToken) && checkTextEqual(*this, _rToken); + return FormulaToken::operator ==(_rToken) && checkTextEqual(mrSheetLimits, *this, _rToken); } bool ScSingleRefToken::operator==( const FormulaToken& r ) const { @@ -644,7 +644,7 @@ const ScSingleRefData* ScDoubleRefToken::GetSingleRef2() const { return &aDou ScSingleRefData* ScDoubleRefToken::GetSingleRef2() { return &aDoubleRef.Ref2; } bool ScDoubleRefToken::TextEqual( const FormulaToken& _rToken ) const { - return FormulaToken::operator ==(_rToken) && checkTextEqual(*this, _rToken); + return FormulaToken::operator ==(_rToken) && checkTextEqual(mrSheetLimits, *this, _rToken); } bool ScDoubleRefToken::operator==( const FormulaToken& r ) const { @@ -1689,7 +1689,7 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo if ( pToken->GetType() == svSingleRef ) { const ScSingleRefData& rRef = *static_cast<const ScSingleRefToken*>(pToken)->GetSingleRef(); - rRange.aStart = rRange.aEnd = rRef.toAbs(rPos); + rRange.aStart = rRange.aEnd = rRef.toAbs(*mxSheetLimits, rPos); bIs = !bValidOnly || mxSheetLimits->ValidAddress(rRange.aStart); } else if ( pToken->GetType() == svDoubleRef ) @@ -1697,8 +1697,8 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo const ScComplexRefData& rCompl = *static_cast<const ScDoubleRefToken*>(pToken)->GetDoubleRef(); const ScSingleRefData& rRef1 = rCompl.Ref1; const ScSingleRefData& rRef2 = rCompl.Ref2; - rRange.aStart = rRef1.toAbs(rPos); - rRange.aEnd = rRef2.toAbs(rPos); + rRange.aStart = rRef1.toAbs(*mxSheetLimits, rPos); + rRange.aEnd = rRef2.toAbs(*mxSheetLimits, rPos); bIs = !bValidOnly || mxSheetLimits->ValidRange(rRange); } } @@ -2311,7 +2311,7 @@ bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, case svSingleRef : { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rPos); switch ( eDir ) { case DIR_BOTTOM : @@ -2348,7 +2348,7 @@ bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, case svDoubleRef : { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rPos); switch ( eDir ) { case DIR_BOTTOM : @@ -2416,7 +2416,7 @@ bool SkipReference(formula::FormulaToken* pToken, const ScAddress& rPos, const S { ScRange aRange; - if (!ScRefTokenHelper::getRangeFromToken(aRange, pToken, rPos)) + if (!ScRefTokenHelper::getRangeFromToken(pOldDoc, aRange, pToken, rPos)) return true; if (bRangeName && aRange.aStart.Tab() == rPos.Tab()) @@ -3083,7 +3083,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (rCxt.isDeleted() && aSelectedRange.In(aAbs)) { @@ -3096,7 +3096,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon if (!rCxt.isDeleted() && rRef.IsDeleted()) { // Check if the token has reference to previously deleted region. - ScAddress aCheckPos = rRef.toAbs(aNewPos); + ScAddress aCheckPos = rRef.toAbs(*mxSheetLimits, aNewPos); if (rCxt.maRange.In(aCheckPos)) { restoreDeletedRef(rRef, rCxt); @@ -3113,13 +3113,13 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon aRes.mbReferenceModified = true; } - rRef.SetAddress(aAbs, aNewPos); + rRef.SetAddress(*mxSheetLimits, aAbs, aNewPos); } break; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (rCxt.isDeleted()) { @@ -3136,7 +3136,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon if (eSR == SHRUNK) { // The reference range has been shrunk. - rRef.SetRange(aAbs, aNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); aRes.mbValueChanged = true; aRes.mbReferenceModified = true; break; @@ -3165,7 +3165,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon if (!rCxt.isDeleted() && rRef.IsDeleted()) { // Check if the token has reference to previously deleted region. - ScRange aCheckRange = rRef.toAbs(aNewPos); + ScRange aCheckRange = rRef.toAbs(*mxSheetLimits, aNewPos); if (aSelectedRange.In(aCheckRange)) { // This reference was previously in the deleted region. Restore it. @@ -3180,7 +3180,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon if (expandRange(rCxt, aAbs, aSelectedRange, rRef)) { // The reference range has been expanded. - rRef.SetRange(aAbs, aNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); aRes.mbValueChanged = true; aRes.mbReferenceModified = true; break; @@ -3189,7 +3189,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon if (expandRangeByEdge(rCxt, aAbs, aSelectedRange, rRef)) { // The reference range has been expanded on the edge. - rRef.SetRange(aAbs, aNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); aRes.mbValueChanged = true; aRes.mbReferenceModified = true; break; @@ -3223,7 +3223,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon aRes.mbValueChanged = true; } - rRef.SetRange(aAbs, aNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); } break; case svExternalSingleRef: @@ -3231,16 +3231,16 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon // For external reference, just reset the reference with // respect to the new cell position. ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); - rRef.SetAddress(aAbs, aNewPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetAddress(*mxSheetLimits, aAbs, aNewPos); } break; case svExternalDoubleRef: { // Same as above. ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); - rRef.SetRange(aAbs, aNewPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); } break; default: @@ -3315,7 +3315,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (aOldRange.In(aAbs)) { ScAddress aErrorPos( ScAddress::UNINITIALIZED ); @@ -3329,14 +3329,14 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( aRes.mbValueChanged = true; } - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rNewPos); rRef.SetFlag3D(aAbs.Tab() != rNewPos.Tab() || !rRef.IsTabRel()); } break; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (aOldRange.In(aAbs)) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); @@ -3350,7 +3350,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( aRes.mbValueChanged = true; } - rRef.SetRange(aAbs, rNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, rNewPos); // Absolute sheet reference => set 3D flag. // More than one sheet referenced => has to have both 3D flags. // If end part has 3D flag => start part must have it too. @@ -3362,15 +3362,15 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( case svExternalSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); - rRef.SetAddress(aAbs, rNewPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rNewPos); } break; case svExternalDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); - rRef.SetRange(aAbs, rNewPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetRange(*mxSheetLimits, aAbs, rNewPos); } break; default: @@ -3424,7 +3424,7 @@ void ScTokenArray::MoveReferenceColReorder( { formula::FormulaToken* pToken = *p; ScSingleRefData& rRef = *pToken->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rPos); if (aAbs.Tab() == nTab && nRow1 <= aAbs.Row() && aAbs.Row() <= nRow2) { @@ -3435,7 +3435,7 @@ void ScTokenArray::MoveReferenceColReorder( // This column is reordered. SCCOL nNewCol = it->second; aAbs.SetCol(nNewCol); - rRef.SetAddress(aAbs, rPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rPos); } } } @@ -3444,7 +3444,7 @@ void ScTokenArray::MoveReferenceColReorder( { formula::FormulaToken* pToken = *p; ScComplexRefData& rRef = *pToken->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rPos); if (aAbs.aStart.Tab() != aAbs.aEnd.Tab()) // Must be a single-sheet reference. @@ -3464,7 +3464,7 @@ void ScTokenArray::MoveReferenceColReorder( SCCOL nNewCol = it->second; aAbs.aStart.SetCol(nNewCol); aAbs.aEnd.SetCol(nNewCol); - rRef.SetRange(aAbs, rPos); + rRef.SetRange(*mxSheetLimits, aAbs, rPos); } } } @@ -3487,7 +3487,7 @@ void ScTokenArray::MoveReferenceRowReorder( const ScAddress& rPos, SCTAB nTab, S { formula::FormulaToken* pToken = *p; ScSingleRefData& rRef = *pToken->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rPos); if (aAbs.Tab() == nTab && nCol1 <= aAbs.Col() && aAbs.Col() <= nCol2) { @@ -3498,7 +3498,7 @@ void ScTokenArray::MoveReferenceRowReorder( const ScAddress& rPos, SCTAB nTab, S // This column is reordered. SCROW nNewRow = it->second; aAbs.SetRow(nNewRow); - rRef.SetAddress(aAbs, rPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rPos); } } } @@ -3507,7 +3507,7 @@ void ScTokenArray::MoveReferenceRowReorder( const ScAddress& rPos, SCTAB nTab, S { formula::FormulaToken* pToken = *p; ScComplexRefData& rRef = *pToken->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rPos); if (aAbs.aStart.Tab() != aAbs.aEnd.Tab()) // Must be a single-sheet reference. @@ -3527,7 +3527,7 @@ void ScTokenArray::MoveReferenceRowReorder( const ScAddress& rPos, SCTAB nTab, S SCROW nNewRow = it->second; aAbs.aStart.SetRow(nNewRow); aAbs.aEnd.SetRow(nNewRow); - rRef.SetRange(aAbs, rPos); + rRef.SetRange(*mxSheetLimits, aAbs, rPos); } } } @@ -3544,7 +3544,7 @@ bool adjustSingleRefInName( ScSingleRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress& rPos, ScComplexRefData* pEndOfComplex ) { - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aAbs.Tab() < rCxt.maRange.aStart.Tab() || rCxt.maRange.aEnd.Tab() < aAbs.Tab()) { @@ -3552,7 +3552,7 @@ bool adjustSingleRefInName( return false; } - if (!rCxt.maRange.In(rRef.toAbs(rPos))) + if (!rCxt.maRange.In(rRef.toAbs(&rCxt.mrDoc, rPos))) return false; bool bChanged = false; @@ -3611,7 +3611,7 @@ bool adjustDoubleRefInName( { if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel()) { - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); // Expand only if at least two rows tall. if (aAbs.aStart.Row() < aAbs.aEnd.Row()) { @@ -3628,7 +3628,7 @@ bool adjustDoubleRefInName( } if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() && !rRef.Ref2.IsColRel()) { - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); // Expand only if at least two columns wide. if (aAbs.aStart.Col() < aAbs.aEnd.Col()) { @@ -3721,7 +3721,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName( // Don't modify relative references in names. break; - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aAbs.Col() < rCxt.maRange.aStart.Col() || rCxt.maRange.aEnd.Col() < aAbs.Col()) // column of the reference is not in the deleted column range. @@ -3750,7 +3750,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName( // Don't modify relative references in names. break; - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aAbs.Row() < rCxt.maRange.aStart.Row() || rCxt.maRange.aEnd.Row() < aAbs.Row()) // row of the reference is not in the deleted row range. @@ -3779,7 +3779,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName( case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() || aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab()) // Sheet references not affected. @@ -3991,7 +3991,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat if (rRef.IsColRel() || rRef.IsRowRel() || rRef.IsTabRel()) continue; - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aOldRange.In(aAbs)) { ScAddress aErrorPos( ScAddress::UNINITIALIZED ); @@ -4000,7 +4000,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat aRes.mbReferenceModified = true; } - rRef.SetAddress(aAbs, rPos); + rRef.SetAddress(rCxt.mrDoc.GetSheetLimits(), aAbs, rPos); } break; case svDoubleRef: @@ -4010,7 +4010,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat rRef.Ref2.IsColRel() || rRef.Ref2.IsRowRel() || rRef.Ref2.IsTabRel()) continue; - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(&rCxt.mrDoc, rPos); if (aOldRange.In(aAbs)) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); @@ -4019,7 +4019,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat aRes.mbReferenceModified = true; } - rRef.SetRange(aAbs, rPos); + rRef.SetRange(rCxt.mrDoc.GetSheetLimits(), aAbs, rPos); } break; default: @@ -4033,9 +4033,9 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat namespace { -bool adjustSingleRefOnDeletedTab( ScSingleRefData& rRef, SCTAB nDelPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos ) +bool adjustSingleRefOnDeletedTab( ScSheetLimits& rLimits, ScSingleRefData& rRef, SCTAB nDelPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos ) { - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(rLimits, rOldPos); if (nDelPos <= aAbs.Tab() && aAbs.Tab() < nDelPos + nSheets) { rRef.SetTabDeleted(true); @@ -4046,45 +4046,45 @@ bool adjustSingleRefOnDeletedTab( ScSingleRefData& rRef, SCTAB nDelPos, SCTAB nS { // Reference sheet needs to be adjusted. aAbs.IncTab(-1*nSheets); - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(rLimits, aAbs, rNewPos); return true; } else if (rOldPos.Tab() != rNewPos.Tab()) { // Cell itself has moved. - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(rLimits, aAbs, rNewPos); return true; } return false; } -bool adjustSingleRefOnInsertedTab( ScSingleRefData& rRef, SCTAB nInsPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos ) +bool adjustSingleRefOnInsertedTab( ScSheetLimits& rLimits, ScSingleRefData& rRef, SCTAB nInsPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos ) { - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(rLimits, rOldPos); if (nInsPos <= aAbs.Tab()) { // Reference sheet needs to be adjusted. aAbs.IncTab(nSheets); - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(rLimits, aAbs, rNewPos); return true; } else if (rOldPos.Tab() != rNewPos.Tab()) { // Cell itself has moved. - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(rLimits, aAbs, rNewPos); return true; } return false; } -bool adjustDoubleRefOnDeleteTab(ScComplexRefData& rRef, SCTAB nDelPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos) +bool adjustDoubleRefOnDeleteTab(ScSheetLimits& rLimits, ScComplexRefData& rRef, SCTAB nDelPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos) { ScSingleRefData& rRef1 = rRef.Ref1; ScSingleRefData& rRef2 = rRef.Ref2; - ScAddress aStartPos = rRef1.toAbs(rOldPos); - ScAddress aEndPos = rRef2.toAbs(rOldPos); + ScAddress aStartPos = rRef1.toAbs(rLimits, rOldPos); + ScAddress aEndPos = rRef2.toAbs(rLimits, rOldPos); bool bMoreThanOneTab = aStartPos.Tab() != aEndPos.Tab(); bool bModified = false; if (bMoreThanOneTab && aStartPos.Tab() == nDelPos && nDelPos + nSheets <= aEndPos.Tab()) @@ -4097,7 +4097,7 @@ bool adjustDoubleRefOnDeleteTab(ScComplexRefData& rRef, SCTAB nDelPos, SCTAB nSh } else { - bModified = adjustSingleRefOnDeletedTab(rRef1, nDelPos, nSheets, rOldPos, rNewPos); + bModified = adjustSingleRefOnDeletedTab(rLimits, rRef1, nDelPos, nSheets, rOldPos, rNewPos); } if (bMoreThanOneTab && aEndPos.Tab() == nDelPos && aStartPos.Tab() <= nDelPos - nSheets) @@ -4110,7 +4110,7 @@ bool adjustDoubleRefOnDeleteTab(ScComplexRefData& rRef, SCTAB nDelPos, SCTAB nSh } else { - bModified |= adjustSingleRefOnDeletedTab(rRef2, nDelPos, nSheets, rOldPos, rNewPos); + bModified |= adjustSingleRefOnDeletedTab(rLimits, rRef2, nDelPos, nSheets, rOldPos, rNewPos); } return bModified; } @@ -4140,14 +4140,14 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnDeletedTab( const sc::RefUpda case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - if (adjustSingleRefOnDeletedTab(rRef, rCxt.mnDeletePos, rCxt.mnSheets, rOldPos, aNewPos)) + if (adjustSingleRefOnDeletedTab(*mxSheetLimits, rRef, rCxt.mnDeletePos, rCxt.mnSheets, rOldPos, aNewPos)) aRes.mbReferenceModified = true; } break; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - aRes.mbReferenceModified |= adjustDoubleRefOnDeleteTab(rRef, rCxt.mnDeletePos, rCxt.mnSheets, rOldPos, aNewPos); + aRes.mbReferenceModified |= adjustDoubleRefOnDeleteTab(*mxSheetLimits, rRef, rCxt.mnDeletePos, rCxt.mnSheets, rOldPos, aNewPos); } break; default: @@ -4213,16 +4213,16 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnInsertedTab( const sc::RefUpd case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - if (adjustSingleRefOnInsertedTab(rRef, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) + if (adjustSingleRefOnInsertedTab(*mxSheetLimits, rRef, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) aRes.mbReferenceModified = true; } break; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - if (adjustSingleRefOnInsertedTab(rRef.Ref1, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) + if (adjustSingleRefOnInsertedTab(*mxSheetLimits, rRef.Ref1, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) aRes.mbReferenceModified = true; - if (adjustSingleRefOnInsertedTab(rRef.Ref2, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) + if (adjustSingleRefOnInsertedTab(*mxSheetLimits, rRef.Ref2, rCxt.mnInsertPos, rCxt.mnSheets, rOldPos, aNewPos)) aRes.mbReferenceModified = true; } break; @@ -4302,21 +4302,21 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( const sc::RefUpdate case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (adjustTabOnMove(aAbs, rCxt)) aRes.mbReferenceModified = true; - rRef.SetAddress(aAbs, aNewPos); + rRef.SetAddress(*mxSheetLimits, aAbs, aNewPos); } break; case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (adjustTabOnMove(aAbs.aStart, rCxt)) aRes.mbReferenceModified = true; if (adjustTabOnMove(aAbs.aEnd, rCxt)) aRes.mbReferenceModified = true; - rRef.SetRange(aAbs, aNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, aNewPos); } break; default: @@ -4376,16 +4376,16 @@ void ScTokenArray::AdjustReferenceOnMovedOrigin( const ScAddress& rOldPos, const case svExternalSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); - rRef.SetAddress(aAbs, rNewPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rNewPos); } break; case svDoubleRef: case svExternalDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); - rRef.SetRange(aAbs, rNewPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); + rRef.SetRange(*mxSheetLimits, aAbs, rNewPos); } break; default: @@ -4417,11 +4417,11 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO case svSingleRef: { ScSingleRefData& rRef = *p->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rOldPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (!bAdjust) bAdjust = (aAbs.Tab() != rOldPos.Tab()); if (bAdjust) - rRef.SetAddress(aAbs, rNewPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rNewPos); } break; case svExternalDoubleRef: @@ -4430,11 +4430,11 @@ void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rO case svDoubleRef: { ScComplexRefData& rRef = *p->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rOldPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rOldPos); if (!bAdjust) bAdjust = (rOldPos.Tab() < aAbs.aStart.Tab() || aAbs.aEnd.Tab() < rOldPos.Tab()); if (bAdjust) - rRef.SetRange(aAbs, rNewPos); + rRef.SetRange(*mxSheetLimits, aAbs, rNewPos); } break; default: @@ -4474,12 +4474,12 @@ void ScTokenArray::AdjustReferenceOnCopy( const ScAddress& rNewPos ) namespace { -void clearTabDeletedFlag( ScSingleRefData& rRef, const ScAddress& rPos, SCTAB nStartTab, SCTAB nEndTab ) +void clearTabDeletedFlag( ScSheetLimits& rLimits, ScSingleRefData& rRef, const ScAddress& rPos, SCTAB nStartTab, SCTAB nEndTab ) { if (!rRef.IsTabDeleted()) return; - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(rLimits, rPos); if (nStartTab <= aAbs.Tab() && aAbs.Tab() <= nEndTab) rRef.SetTabDeleted(false); } @@ -4501,15 +4501,15 @@ void ScTokenArray::ClearTabDeleted( const ScAddress& rPos, SCTAB nStartTab, SCTA { formula::FormulaToken* pToken = *p; ScSingleRefData& rRef = *pToken->GetSingleRef(); - clearTabDeletedFlag(rRef, rPos, nStartTab, nEndTab); + clearTabDeletedFlag(*mxSheetLimits, rRef, rPos, nStartTab, nEndTab); } break; case svDoubleRef: { formula::FormulaToken* pToken = *p; ScComplexRefData& rRef = *pToken->GetDoubleRef(); - clearTabDeletedFlag(rRef.Ref1, rPos, nStartTab, nEndTab); - clearTabDeletedFlag(rRef.Ref2, rPos, nStartTab, nEndTab); + clearTabDeletedFlag(*mxSheetLimits, rRef.Ref1, rPos, nStartTab, nEndTab); + clearTabDeletedFlag(*mxSheetLimits, rRef.Ref2, rPos, nStartTab, nEndTab); } break; default: @@ -4528,7 +4528,7 @@ void checkBounds( if (!rRef.IsRowRel()) return; - ScRange aAbs(rRef.toAbs(rPos)); + ScRange aAbs(rRef.toAbs(rLimits, rPos)); aAbs.aEnd.IncRow(nGroupLen-1); if (!rCheckRange.Intersects(aAbs) && (!pDeletedRange || !pDeletedRange->Intersects(aAbs))) return; @@ -4725,10 +4725,10 @@ void ScTokenArray::CheckExpandReferenceBounds( if (!bStartRowRelative && !bEndRowRelative) break; // switch - ScRange aAbsStart(rRef.toAbs(rPos)); + ScRange aAbsStart(rRef.toAbs(*mxSheetLimits, rPos)); ScAddress aPos(rPos); aPos.IncRow(nGroupLen); - ScRange aAbsEnd(rRef.toAbs(aPos)); + ScRange aAbsEnd(rRef.toAbs(*mxSheetLimits, aPos)); // References must be at least two rows to be expandable. if ((aAbsStart.aEnd.Row() - aAbsStart.aStart.Row() < 1) && (aAbsEnd.aEnd.Row() - aAbsEnd.aStart.Row() < 1)) @@ -4842,7 +4842,7 @@ void appendTokenByType( ScSheetLimits& rLimits, sc::TokenStringContext& rCxt, OU break; case svExternalSingleRef: rCxt.mpRefConv->makeExternalRefStr( - rBuf, rPos, nFileId, aFileName, aTabName, *rToken.GetSingleRef()); + rLimits, rBuf, rPos, nFileId, aFileName, aTabName, *rToken.GetSingleRef()); break; case svExternalDoubleRef: { @@ -5184,16 +5184,16 @@ void ScTokenArray::WrapReference( const ScAddress& rPos, SCCOL nMaxCol, SCROW nM { formula::FormulaToken* pToken = *p; ScSingleRefData& rRef = *pToken->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rPos); wrapAddress(aAbs, nMaxCol, nMaxRow); - rRef.SetAddress(aAbs, rPos); + rRef.SetAddress(*mxSheetLimits, aAbs, rPos); } break; case svDoubleRef: { formula::FormulaToken* pToken = *p; ScComplexRefData& rRef = *pToken->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rPos); // Entire columns/rows are sticky. if (!rRef.IsEntireCol() && !rRef.IsEntireRow()) { @@ -5206,7 +5206,7 @@ void ScTokenArray::WrapReference( const ScAddress& rPos, SCCOL nMaxCol, SCROW nM wrapRowRange( aAbs, nMaxRow); // else nothing if both, column and row, are entire. aAbs.PutInOrder(); - rRef.SetRange(aAbs, rPos); + rRef.SetRange(*mxSheetLimits, aAbs, rPos); } break; default: @@ -5227,7 +5227,7 @@ bool ScTokenArray::NeedsWrapReference( const ScAddress& rPos, SCCOL nMaxCol, SCR { formula::FormulaToken* pToken = *p; ScSingleRefData& rRef = *pToken->GetSingleRef(); - ScAddress aAbs = rRef.toAbs(rPos); + ScAddress aAbs = rRef.toAbs(*mxSheetLimits, rPos); if (aAbs.Col() > nMaxCol || aAbs.Row() > nMaxRow) return true; } @@ -5236,7 +5236,7 @@ bool ScTokenArray::NeedsWrapReference( const ScAddress& rPos, SCCOL nMaxCol, SCR { formula::FormulaToken* pToken = *p; ScComplexRefData& rRef = *pToken->GetDoubleRef(); - ScRange aAbs = rRef.toAbs(rPos); + ScRange aAbs = rRef.toAbs(*mxSheetLimits, rPos); // Entire columns/rows are sticky. if ( (!rRef.IsEntireCol() && (aAbs.aStart.Row() > nMaxRow || aAbs.aEnd.Row() > nMaxRow)) || (!rRef.IsEntireRow() && (aAbs.aStart.Col() > nMaxCol || aAbs.aEnd.Col() > nMaxCol))) |