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>

1 files changed, 11 insertions, 11 deletions

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 ) );
 }