sc: rowcol: tdf#50916 convert documen*

Change-Id: I101ff537181058500d240c44114bfefedc03aee4
Reviewed-on: https://gerrit.libreoffice.org/81429
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 102 insertions, 102 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 256f105ed7fd..171ec8c1624a 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1823,7 +1823,7 @@ public:
                     // determine Col/Row of subsequent calls
                     // (e.g. not found from the beginning, or subsequent tables)
                     // meaning of explanation in "()" was already unclear in German
-    static void     GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
+    void            GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
                                               SCCOL& rCol, SCROW& rRow );
 
     bool            Solver( SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d831e2b58d9f..ca62ddab9235 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -107,7 +107,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) :
         pPreviewCellStyle( nullptr ),
         nUnoObjectId( 0 ),
         nRangeOverflowType( 0 ),
-        aCurTextWidthCalcPos(MAXCOL,0,0),
+        aCurTextWidthCalcPos(MaxCol(),0,0),
         nFormulaCodeInTree(0),
         nXMLImportedFormulaCount( 0 ),
         nInterpretLevel(0),
@@ -303,7 +303,7 @@ void ScDocument::ClosingClipboardSource()
     if (!bIsClip)
         return;
 
-    ForgetNoteCaptions( ScRangeList( ScRange( 0,0,0, MAXCOL, MAXROW, GetTableCount()-1)), true);
+    ForgetNoteCaptions( ScRangeList( ScRange( 0,0,0, MaxCol(), MaxRow(), GetTableCount()-1)), true);
 }
 
 ScDocument::~ScDocument()
@@ -557,7 +557,7 @@ bool ScDocument::GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
         bool bAny = maTabs[nTab]->GetPrintArea( rEndCol, rEndRow, bNotes );
         if (mpDrawLayer)
         {
-            ScRange aDrawRange(0,0,nTab, MAXCOL,MAXROW,nTab);
+            ScRange aDrawRange(0,0,nTab, MaxCol(),MaxRow(),nTab);
             if (DrawGetPrintArea( aDrawRange, true, true ))
             {
                 if (aDrawRange.aEnd.Col()>rEndCol) rEndCol=aDrawRange.aEnd.Col();
@@ -581,7 +581,7 @@ bool ScDocument::GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
         bool bAny = maTabs[nTab]->GetPrintAreaHor( nStartRow, nEndRow, rEndCol );
         if (mpDrawLayer)
         {
-            ScRange aDrawRange(0,nStartRow,nTab, MAXCOL,nEndRow,nTab);
+            ScRange aDrawRange(0,nStartRow,nTab, MaxCol(),nEndRow,nTab);
             if (DrawGetPrintArea( aDrawRange, true, false ))
             {
                 if (aDrawRange.aEnd.Col()>rEndCol) rEndCol=aDrawRange.aEnd.Col();
@@ -603,7 +603,7 @@ bool ScDocument::GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol,
         bool bAny = maTabs[nTab]->GetPrintAreaVer( nStartCol, nEndCol, rEndRow, bNotes );
         if (mpDrawLayer)
         {
-            ScRange aDrawRange(nStartCol,0,nTab, nEndCol,MAXROW,nTab);
+            ScRange aDrawRange(nStartCol,0,nTab, nEndCol,MaxRow(),nTab);
             if (DrawGetPrintArea( aDrawRange, false, true ))
             {
                 if (aDrawRange.aEnd.Row()>rEndRow) rEndRow=aDrawRange.aEnd.Row();
@@ -624,7 +624,7 @@ bool ScDocument::GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow )
         bool bAny = maTabs[nTab]->GetDataStart( rStartCol, rStartRow );
         if (mpDrawLayer)
         {
-            ScRange aDrawRange(0,0,nTab, MAXCOL,MAXROW,nTab);
+            ScRange aDrawRange(0,0,nTab, MaxCol(),MaxRow(),nTab);
             if (DrawGetPrintArea( aDrawRange, true, true ))
             {
                 if (aDrawRange.aStart.Col()<rStartCol) rStartCol=aDrawRange.aStart.Col();
@@ -697,7 +697,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress )
             sc::RefUpdateMoveTabContext aCxt( *this, nOldPos, nNewPos);
 
             SCTAB nDz = nNewPos - nOldPos;
-            ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos );
+            ScRange aSourceRange( 0,0,nOldPos, MaxCol(),MaxRow(),nOldPos );
             if (pRangeName)
                 pRangeName->UpdateMoveTab(aCxt);
 
@@ -709,7 +709,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress )
             if (pDetOpList)
                 pDetOpList->UpdateReference( this, URM_REORDER, aSourceRange, 0,0,nDz );
             UpdateChartRef( URM_REORDER,
-                    0,0,nOldPos, MAXCOL,MAXROW,nOldPos, 0,0,nDz );
+                    0,0,nOldPos, MaxCol(),MaxRow(),nOldPos, 0,0,nDz );
             UpdateRefAreaLinks( URM_REORDER, aSourceRange, 0,0,nDz );
             if ( pValidationList )
                 pValidationList->UpdateMoveTab(aCxt);
@@ -777,19 +777,19 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
             {
                 SetNoListening( true );
 
-                ScRange aRange( 0,0,nNewPos, MAXCOL,MAXROW,MAXTAB );
+                ScRange aRange( 0,0,nNewPos, MaxCol(),MaxRow(),MAXTAB );
                 xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
                 xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
                 if (pRangeName)
                     pRangeName->UpdateInsertTab(aCxt);
 
                 pDBCollection->UpdateReference(
-                                    URM_INSDEL, 0,0,nNewPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
+                                    URM_INSDEL, 0,0,nNewPos, MaxCol(),MaxRow(),MAXTAB, 0,0,1 );
                 if (pDPCollection)
                     pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,1 );
                 if (pDetOpList)
                     pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,1 );
-                UpdateChartRef( URM_INSDEL, 0,0,nNewPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
+                UpdateChartRef( URM_INSDEL, 0,0,nNewPos, MaxCol(),MaxRow(),MAXTAB, 0,0,1 );
                 UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,1 );
                 if ( pUnoBroadcaster )
                     pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL, aRange, 0,0,1 ) );
@@ -830,7 +830,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         GetRangeName()->CopyUsedNames( -1, nRealOldPos, nNewPos, *this, *this, bGlobalNamesToLocal);
 
         sc::CopyToDocContext aCopyDocCxt(*this);
-        maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, InsertDeleteFlags::ALL,
+        maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MaxCol(), MaxRow(), InsertDeleteFlags::ALL,
                 (pOnlyMarked != nullptr), maTabs[nNewPos].get(), pOnlyMarked,
                 false /*bAsLink*/, true /*bColRowFlags*/, bGlobalNamesToLocal, false /*bCopyCaptions*/ );
         maTabs[nNewPos]->SetTabBgColor(maTabs[nOldPos]->GetTabBgColor());
@@ -838,7 +838,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         SCTAB nDz = nNewPos - nOldPos;
         sc::RefUpdateContext aRefCxt(*this);
         aRefCxt.meMode = URM_COPY;
-        aRefCxt.maRange = ScRange(0, 0, nNewPos, MAXCOL, MAXROW, nNewPos);
+        aRefCxt.maRange = ScRange(0, 0, nNewPos, MaxCol(), MaxRow(), nNewPos);
         aRefCxt.mnTabDelta = nDz;
         maTabs[nNewPos]->UpdateReference(aRefCxt);
 
@@ -876,7 +876,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         // 1. the updated source ScColumn::nTab members if nNewPos <= nOldPos
         // 2. row heights and column widths of the destination
         // 3. RTL settings of the destination
-        maTabs[nOldPos]->CopyCaptionsToTable( 0, 0, MAXCOL, MAXROW, maTabs[nNewPos].get(), true /*bCloneCaption*/);
+        maTabs[nOldPos]->CopyCaptionsToTable( 0, 0, MaxCol(), MaxRow(), maTabs[nNewPos].get(), true /*bCloneCaption*/);
     }
 
     return bValid;
@@ -918,7 +918,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
     {
         if (ValidTab(nDestPos) && nDestPos < static_cast<SCTAB>(maTabs.size()) && maTabs[nDestPos])
         {
-            maTabs[nDestPos]->DeleteArea( 0,0, MAXCOL,MAXROW, InsertDeleteFlags::ALL );
+            maTabs[nDestPos]->DeleteArea( 0,0, MaxCol(),MaxRow(), InsertDeleteFlags::ALL );
         }
         else
             bValid = false;
@@ -951,7 +951,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         pNames->CopyUsedNames( nSrcPos, nSrcPos, nDestPos, *pSrcDoc, *this, bGlobalNamesToLocal);
                     pSrcDoc->GetRangeName()->CopyUsedNames( -1, nSrcPos, nDestPos, *pSrcDoc, *this, bGlobalNamesToLocal);
                 }
-                pSrcDoc->maTabs[nSrcPos]->CopyToTable(aCxt, 0, 0, MAXCOL, MAXROW,
+                pSrcDoc->maTabs[nSrcPos]->CopyToTable(aCxt, 0, 0, MaxCol(), MaxRow(),
                         ( bResultsOnly ? InsertDeleteFlags::ALL & ~InsertDeleteFlags::FORMULA : InsertDeleteFlags::ALL),
                         false, maTabs[nDestPos].get(), /*pMarkData*/nullptr, /*bAsLink*/false, /*bColRowFlags*/true,
                         /*bGlobalNamesToLocal*/false, /*bCopyCaptions*/true );
@@ -964,7 +964,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
         {
             sc::RefUpdateContext aRefCxt(*this);
             aRefCxt.meMode = URM_COPY;
-            aRefCxt.maRange = ScRange(0, 0, nDestPos, MAXCOL, MAXROW, nDestPos);
+            aRefCxt.maRange = ScRange(0, 0, nDestPos, MaxCol(), MaxRow(), nDestPos);
             aRefCxt.mnTabDelta = nDestPos - nSrcPos;
             maTabs[nDestPos]->UpdateReference(aRefCxt);
 
@@ -980,7 +980,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             sc::StartListeningContext aSLCxt(*this);
             maTabs[nDestPos]->StartListeners(aSLCxt, true);
         }
-        SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos), false);
+        SetDirty( ScRange( 0, 0, nDestPos, MaxCol(), MaxRow(), nDestPos), false);
 
         if ( bResultsOnly )
             pSrcDoc->SetAutoCalc( bOldAutoCalcSrc );
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index ea94920a6a81..783bac66f2fd 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1200,36 +1200,36 @@ void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
         {
             if ( rSearchItem.GetPattern() )
             {
-                rCol = MAXCOL;
-                rRow = MAXROW+1;
+                rCol = MaxCol();
+                rRow = MaxRow()+1;
             }
             else if ( bReplace )
             {
-                rCol = MAXCOL;
-                rRow = MAXROW;
+                rCol = MaxCol();
+                rRow = MaxRow();
             }
             else
             {
-                rCol = MAXCOL+1;
-                rRow = MAXROW;
+                rCol = MaxCol()+1;
+                rRow = MaxRow();
             }
         }
         else
         {
             if ( rSearchItem.GetPattern() )
             {
-                rCol = MAXCOL+1;
-                rRow = MAXROW;
+                rCol = MaxCol()+1;
+                rRow = MaxRow();
             }
             else if ( bReplace )
             {
-                rCol = MAXCOL;
-                rRow = MAXROW;
+                rCol = MaxCol();
+                rRow = MaxRow();
             }
             else
             {
-                rCol = MAXCOL;
-                rRow = MAXROW+1;
+                rCol = MaxCol();
+                rRow = MaxRow()+1;
             }
         }
     }
@@ -1791,7 +1791,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const tools::Rectangle& rMMRect, bool
     while (!bEnd)
     {
         nAdd = static_cast<long>(pTable->GetColWidth(nX1, bHiddenAsZero));
-        if (nSize+nAdd <= nTwips+1 && nX1<MAXCOL)
+        if (nSize+nAdd <= nTwips+1 && nX1<MaxCol())
         {
             nSize += nAdd;
             ++nX1;
@@ -1809,7 +1809,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const tools::Rectangle& rMMRect, bool
         while (!bEnd)
         {
             nAdd = static_cast<long>(pTable->GetColWidth(nX2, bHiddenAsZero));
-            if (nSize+nAdd < nTwips && nX2<MAXCOL)
+            if (nSize+nAdd < nTwips && nX2<MaxCol())
             {
                 nSize += nAdd;
                 ++nX2;
@@ -1824,16 +1824,16 @@ ScRange ScDocument::GetRange( SCTAB nTab, const tools::Rectangle& rMMRect, bool
 
     SCROW nY1 = 0;
     // Was if(nSize+nAdd<=nTwips+1) inside loop => if(nSize+nAdd<nTwips+2)
-    if (lcl_AddTwipsWhile( nSize, nTwips+2, nY1, MAXROW, pTable, bHiddenAsZero) && nY1 < MAXROW)
-        ++nY1;  // original loop ended on last matched +1 unless that was MAXROW
+    if (lcl_AddTwipsWhile( nSize, nTwips+2, nY1, MaxRow(), pTable, bHiddenAsZero) && nY1 < MaxRow())
+        ++nY1;  // original loop ended on last matched +1 unless that was rDoc.MaxRow()
 
     SCROW nY2 = nY1;
     if (!aPosRect.IsEmpty())
     {
         nTwips = static_cast<long>(aPosRect.Bottom() / HMM_PER_TWIPS);
         // Was if(nSize+nAdd<nTwips) inside loop => if(nSize+nAdd<nTwips)
-        if (lcl_AddTwipsWhile( nSize, nTwips, nY2, MAXROW, pTable, bHiddenAsZero) && nY2 < MAXROW)
-            ++nY2;  // original loop ended on last matched +1 unless that was MAXROW
+        if (lcl_AddTwipsWhile( nSize, nTwips, nY2, MaxRow(), pTable, bHiddenAsZero) && nY2 < MaxRow())
+            ++nY2;  // original loop ended on last matched +1 unless that was rDoc.MaxRow()
     }
 
     return ScRange( nX1,nY1,nTab, nX2,nY2,nTab );
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 8b55b15a6f50..1c64afa18842 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -263,8 +263,8 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
 {
     PutInOrder(nCol1, nCol2);
     PutInOrder(nRow1, nRow2);
-    nCol2 = std::min<SCCOL>(nCol2, MAXCOL);
-    nRow2 = std::min<SCROW>(nRow2, MAXROW);
+    nCol2 = std::min<SCCOL>(nCol2, MaxCol());
+    nRow2 = std::min<SCROW>(nRow2, MaxRow());
     if (!rMark.GetSelectCount())
     {
         SAL_WARN("sc", "ScDocument::InsertMatrixFormula: No table marked");
@@ -1244,20 +1244,20 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
                 {
                     // gap -> deleted
                     ScRange aDelRange( nOtherCol+1, 0, nOtherTab,
-                                        nLastOtherCol-1, MAXROW, nOtherTab );
+                                        nLastOtherCol-1, MaxRow(), nOtherTab );
                     pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 );
                 }
-                if ( nOtherCol > MAXCOL )                       // inserted
+                if ( nOtherCol > MaxCol() )                       // inserted
                 {
                     //  combine
                     if ( nThisCol == nThisEndCol || ValidCol(static_cast<SCCOL>(pOtherCols[nThisCol+1])) )
                     {
                         SCCOL nFirstNew = nThisCol;
-                        while ( nFirstNew > 0 && pOtherCols[nFirstNew-1] > MAXCOL )
+                        while ( nFirstNew > 0 && pOtherCols[nFirstNew-1] > MaxCol() )
                             --nFirstNew;
                         SCCOL nDiff = nThisCol - nFirstNew;
                         ScRange aRange( nLastOtherCol, 0, nOtherTab,
-                                        nLastOtherCol+nDiff, MAXROW, nOtherTab );
+                                        nLastOtherCol+nDiff, MaxRow(), nOtherTab );
                         pChangeTrack->AppendInsert( aRange );
                     }
                 }
@@ -1267,7 +1267,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
             if ( nLastOtherCol > 0 )                            // deleted at the very top
             {
                 ScRange aDelRange( 0, 0, nOtherTab,
-                                    nLastOtherCol-1, MAXROW, nOtherTab );
+                                    nLastOtherCol-1, MaxRow(), nOtherTab );
                 pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 );
             }
 
@@ -1283,20 +1283,20 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
                 {
                     // gap -> deleted
                     ScRange aDelRange( 0, nOtherRow+1, nOtherTab,
-                                        MAXCOL, nLastOtherRow-1, nOtherTab );
+                                        MaxCol(), nLastOtherRow-1, nOtherTab );
                     pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 );
                 }
-                if ( nOtherRow > MAXROW )                       // inserted
+                if ( nOtherRow > MaxRow() )                       // inserted
                 {
                     //  combine
                     if ( nThisRow == nThisEndRow || ValidRow(pOtherRows[nThisRow+1]) )
                     {
                         SCROW nFirstNew = nThisRow;
-                        while ( nFirstNew > 0 && pOtherRows[nFirstNew-1] > MAXROW )
+                        while ( nFirstNew > 0 && pOtherRows[nFirstNew-1] > MaxRow() )
                             --nFirstNew;
                         SCROW nDiff = nThisRow - nFirstNew;
                         ScRange aRange( 0, nLastOtherRow, nOtherTab,
-                                        MAXCOL, nLastOtherRow+nDiff, nOtherTab );
+                                        MaxCol(), nLastOtherRow+nDiff, nOtherTab );
                         pChangeTrack->AppendInsert( aRange );
                     }
                 }
@@ -1306,7 +1306,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
             if ( nLastOtherRow > 0 )                            // deleted at the very top
             {
                 ScRange aDelRange( 0, 0, nOtherTab,
-                                    MAXCOL, nLastOtherRow-1, nOtherTab );
+                                    MaxCol(), nLastOtherRow-1, nOtherTab );
                 pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 );
             }
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 787d0d7fed85..a513bd064de7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -305,7 +305,7 @@ void ScDocument::InvalidateTextWidth( const OUString& rStyleName )
 void ScDocument::InvalidateTextWidth( SCTAB nTab )
 {
     ScAddress aAdrFrom( 0,    0,        nTab );
-    ScAddress aAdrTo  ( MAXCOL, MAXROW, nTab );
+    ScAddress aAdrTo  ( MaxCol(), MaxRow(), nTab );
     InvalidateTextWidth( &aAdrFrom, &aAdrTo, false );
 }
 
@@ -555,7 +555,7 @@ bool ScDocument::IdleCalcTextWidth()            // true = try next again
 
     if (aScope.Col() < 0)
     {
-        aScope.setCol(MAXCOL);
+        aScope.setCol(MaxCol());
         aScope.incTab();
     }
 
@@ -580,7 +580,7 @@ bool ScDocument::IdleCalcTextWidth()            // true = try next again
     aScope.setCol(pTab->ClampToAllocatedColumns(aScope.Col()));
     // Start at specified cell position (nCol, nRow, nTab).
     ScColumn* pCol  = &pTab->aCol[aScope.Col()];
-    std::unique_ptr<ScColumnTextWidthIterator> pColIter(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MAXROW));
+    std::unique_ptr<ScColumnTextWidthIterator> pColIter(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MaxRow()));
 
     OutputDevice* pDev = nullptr;
     sal_uInt16 nRestart = 0;
@@ -633,7 +633,7 @@ bool ScDocument::IdleCalcTextWidth()            // true = try next again
             if (aScope.Col() < 0)
             {
                 // No more column to the left.  Move to the right-most column of the next sheet.
-                aScope.setCol(MAXCOL);
+                aScope.setCol(MaxCol());
                 aScope.incTab();
                 bNewTab = true;
             }
@@ -677,7 +677,7 @@ bool ScDocument::IdleCalcTextWidth()            // true = try next again
                 if ( nZoom > 0 )
                 {
                     pCol  = &pTab->aCol[aScope.Col()];
-                    pColIter.reset(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MAXROW));
+                    pColIter.reset(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MaxRow()));
                 }
                 else
                 {
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 82224b23ecb3..056ad097a3d4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -523,18 +523,18 @@ bool ScDocument::InsertTab(
             {
                 sc::RefUpdateInsertTabContext aCxt( *this, nPos, 1);
 
-                ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
+                ScRange aRange( 0,0,nPos, MaxCol(),MaxRow(),MAXTAB );
                 xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
                 xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
                 if (pRangeName)
                     pRangeName->UpdateInsertTab(aCxt);
                 pDBCollection->UpdateReference(
-                                    URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
+                                    URM_INSDEL, 0,0,nPos, MaxCol(),MaxRow(),MAXTAB, 0,0,1 );
                 if (pDPCollection)
                     pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,1 );
                 if (pDetOpList)
                     pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,1 );
-                UpdateChartRef( URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
+                UpdateChartRef( URM_INSDEL, 0,0,nPos, MaxCol(),MaxRow(),MAXTAB, 0,0,1 );
                 UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,1 );
                 if ( pUnoBroadcaster )
                     pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL, aRange, 0,0,1 ) );
@@ -610,18 +610,18 @@ bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames,
             if (ValidTab(nPos) && (nPos < nTabCount))
             {
                 sc::RefUpdateInsertTabContext aCxt( *this, nPos, nNewSheets);
-                ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
+                ScRange aRange( 0,0,nPos, MaxCol(),MaxRow(),MAXTAB );
                 xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,nNewSheets );
                 xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,nNewSheets );
                 if (pRangeName)
                     pRangeName->UpdateInsertTab(aCxt);
                 pDBCollection->UpdateReference(
-                                    URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,nNewSheets );
+                                    URM_INSDEL, 0,0,nPos, MaxCol(),MaxRow(),MAXTAB, 0,0,nNewSheets );
                 if (pDPCollection)
                     pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,nNewSheets );
                 if (pDetOpList)
                     pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,nNewSheets );
-                UpdateChartRef( URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,nNewSheets );
+                UpdateChartRef( URM_INSDEL, 0,0,nPos, MaxCol(),MaxRow(),MAXTAB, 0,0,nNewSheets );
                 UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0, nNewSheets );
                 if ( pUnoBroadcaster )
                     pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL, aRange, 0,0,nNewSheets ) );
@@ -683,7 +683,7 @@ bool ScDocument::DeleteTab( SCTAB nTab )
                 sc::AutoCalcSwitch aACSwitch(*this, false);
                 sc::RefUpdateDeleteTabContext aCxt( *this, nTab, 1);
 
-                ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
+                ScRange aRange( 0, 0, nTab, MaxCol(), MaxRow(), nTab );
                 DelBroadcastAreasInRange( aRange );
 
                 // #i8180# remove database ranges etc. that are on the deleted tab
@@ -706,12 +706,12 @@ bool ScDocument::DeleteTab( SCTAB nTab )
                 if (pRangeName)
                     pRangeName->UpdateDeleteTab(aCxt);
                 pDBCollection->UpdateReference(
-                                    URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
+                                    URM_INSDEL, 0,0,nTab, MaxCol(),MaxRow(),MAXTAB, 0,0,-1 );
                 if (pDPCollection)
                     pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,-1 );
                 if (pDetOpList)
                     pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,-1 );
-                UpdateChartRef( URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
+                UpdateChartRef( URM_INSDEL, 0,0,nTab, MaxCol(),MaxRow(),MAXTAB, 0,0,-1 );
                 UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,-1 );
                 if (pValidationList)
                 {
@@ -773,7 +773,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets )
 
                 for (SCTAB aTab = 0; aTab < nSheets; ++aTab)
                 {
-                    ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab + aTab );
+                    ScRange aRange( 0, 0, nTab, MaxCol(), MaxRow(), nTab + aTab );
                     DelBroadcastAreasInRange( aRange );
 
                     // #i8180# remove database ranges etc. that are on the deleted tab
@@ -794,16 +794,16 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets )
 
                 // normal reference update
 
-                ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTabCount - 1 );
+                ScRange aRange( 0, 0, nTab, MaxCol(), MaxRow(), nTabCount - 1 );
                 xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1*nSheets );
                 xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1*nSheets );
                 pDBCollection->UpdateReference(
-                                    URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1*nSheets );
+                                    URM_INSDEL, 0,0,nTab, MaxCol(),MaxRow(),MAXTAB, 0,0,-1*nSheets );
                 if (pDPCollection)
                     pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,-1*nSheets );
                 if (pDetOpList)
                     pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,-1*nSheets );
-                UpdateChartRef( URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1*nSheets );
+                UpdateChartRef( URM_INSDEL, 0,0,nTab, MaxCol(),MaxRow(),MAXTAB, 0,0,-1*nSheets );
                 UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,-1*nSheets );
                 if (pValidationList)
                 {
@@ -1128,8 +1128,8 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList )
         for ( size_t i = 0, nCount = rRangeList->size(); i < nCount; i++ )
         {
             ScRange aRange( (*rRangeList)[i] );
-            if ( ( aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL ) ||
-                 ( aRange.aStart.Row() == 0 && aRange.aEnd.Row() == MAXROW ) )
+            if ( ( aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MaxCol() ) ||
+                 ( aRange.aStart.Row() == 0 && aRange.aEnd.Row() == MaxRow() ) )
             {
                 SCCOL nStartCol = aRange.aStart.Col();
                 SCROW nStartRow = aRange.aStart.Row();
@@ -1273,7 +1273,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
         SCTAB nTabRangeStart = nStartTab;
         SCTAB nTabRangeEnd = nEndTab;
         lcl_GetFirstTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) );
-        ScRange aShiftedRange(nStartCol, nStartRow, nTabRangeStart, nEndCol, MAXROW, nTabRangeEnd);
+        ScRange aShiftedRange(nStartCol, nStartRow, nTabRangeStart, nEndCol, MaxRow(), nTabRangeEnd);
         sc::EndListeningContext aEndListenCxt(*this);
 
         std::vector<ScAddress> aGroupPos;
@@ -1320,7 +1320,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
         for (i=nStartTab; i<=nEndTab && i < static_cast<SCTAB>(maTabs.size()); i++)
             if (maTabs[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
                 maTabs[i]->UpdateDrawRef( URM_INSDEL,
-                            nStartCol, nStartRow, nStartTab, nEndCol, MAXROW, nEndTab,
+                            nStartCol, nStartRow, nStartTab, nEndCol, MaxRow(), nEndTab,
                             0, static_cast<SCROW>(nSize), 0 );
 
         if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() )
@@ -1389,12 +1389,12 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
                 ScAddress( nEndCol, nStartRow+nSize-1, nTabRangeEnd ) ) );
             UpdateBroadcastAreas( URM_INSDEL, ScRange(
                 ScAddress( nStartCol, nStartRow+nSize, nTabRangeStart ),
-                ScAddress( nEndCol, MAXROW, nTabRangeEnd )), 0, -static_cast<SCROW>(nSize), 0 );
+                ScAddress( nEndCol, MaxRow(), nTabRangeEnd )), 0, -static_cast<SCROW>(nSize), 0 );
         }
         else
             DelBroadcastAreasInRange( ScRange(
                 ScAddress( nStartCol, nStartRow, nTabRangeStart ),
-                ScAddress( nEndCol, MAXROW, nTabRangeEnd ) ) );
+                ScAddress( nEndCol, MaxRow(), nTabRangeEnd ) ) );
     }
     while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) ) );
 
@@ -1412,7 +1412,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
         }
         else
         {
-            aCxt.maRange = ScRange( nStartCol, nStartRow+nSize, nTabRangeStart, nEndCol, MAXROW, nTabRangeEnd);
+            aCxt.maRange = ScRange( nStartCol, nStartRow+nSize, nTabRangeStart, nEndCol, MaxRow(), nTabRangeEnd);
         }
         do
         {
@@ -1519,7 +1519,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
         {
             UpdateBroadcastAreas( URM_INSDEL, ScRange(
                 ScAddress( nStartCol, nStartRow, nTabRangeStart ),
-                ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), static_cast<SCCOL>(nSize), 0, 0 );
+                ScAddress( MaxCol(), nEndRow, nTabRangeEnd )), static_cast<SCCOL>(nSize), 0, 0 );
         }
         while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) ) );
 
@@ -1527,7 +1527,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
 
         sc::RefUpdateContext aCxt(*this);
         aCxt.meMode = URM_INSDEL;
-        aCxt.maRange = ScRange(nStartCol, nStartRow, nTabRangeStart, MAXCOL, nEndRow, nTabRangeEnd);
+        aCxt.maRange = ScRange(nStartCol, nStartRow, nTabRangeStart, MaxCol(), nEndRow, nTabRangeEnd);
         aCxt.mnColDelta = nSize;
         do
         {
@@ -1600,12 +1600,12 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
                 ScAddress( sal::static_int_cast<SCCOL>(nStartCol+nSize-1), nEndRow, nTabRangeEnd ) ) );
             UpdateBroadcastAreas( URM_INSDEL, ScRange(
                 ScAddress( sal::static_int_cast<SCCOL>(nStartCol+nSize), nStartRow, nTabRangeStart ),
-                ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), -static_cast<SCCOL>(nSize), 0, 0 );
+                ScAddress( MaxCol(), nEndRow, nTabRangeEnd )), -static_cast<SCCOL>(nSize), 0, 0 );
         }
         else
             DelBroadcastAreasInRange( ScRange(
                 ScAddress( nStartCol, nStartRow, nTabRangeStart ),
-                ScAddress( MAXCOL, nEndRow, nTabRangeEnd ) ) );
+                ScAddress( MaxCol(), nEndRow, nTabRangeEnd ) ) );
     }
     while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) ) );
 
@@ -1624,7 +1624,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
         else
         {
             aCxt.maRange = ScRange( sal::static_int_cast<SCCOL>(nStartCol+nSize), nStartRow, nTabRangeStart,
-                    MAXCOL, nEndRow, nTabRangeEnd);
+                    MaxCol(), nEndRow, nTabRangeEnd);
         }
         do
         {
@@ -1830,13 +1830,13 @@ bool ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew )
 
     if ( bInsCol || bDelCol )
     {
-        aColRange.aEnd.SetCol(MAXCOL);
+        aColRange.aEnd.SetCol(MaxCol());
         if ( HasPartOfMerged(aColRange) )
             bOk = false;
     }
     if ( bInsRow || bDelRow )
     {
-        aRowRange.aEnd.SetRow(MAXROW);
+        aRowRange.aEnd.SetRow(MaxRow());
         if ( HasPartOfMerged(aRowRange) )
             bOk = false;
     }
@@ -2082,7 +2082,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         sc::AutoCalcSwitch aACSwitch(rDestDoc, false); // avoid multiple calculations
 
         if (nTab1 > 0)
-            CopyToDocument(0, 0, 0, MAXCOL, MAXROW, nTab1-1, InsertDeleteFlags::FORMULA, false, rDestDoc);
+            CopyToDocument(0, 0, 0, MaxCol(), MaxRow(), nTab1-1, InsertDeleteFlags::FORMULA, false, rDestDoc);
 
         sc::CopyToDocContext aCxt(rDestDoc);
         assert( nTab2 < static_cast<SCTAB>(maTabs.size()) && nTab2 < static_cast<SCTAB>(rDestDoc.maTabs.size()));
@@ -2094,7 +2094,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         }
 
         if (nTab2 < MAXTAB)
-            CopyToDocument(0, 0, nTab2+1, MAXCOL, MAXROW, MAXTAB, InsertDeleteFlags::FORMULA, false, rDestDoc);
+            CopyToDocument(0, 0, nTab2+1, MaxCol(), MaxRow(), MAXTAB, InsertDeleteFlags::FORMULA, false, rDestDoc);
     }
 }
 
@@ -2142,7 +2142,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
 
     sc::CopyToDocContext aCxt(rDestDoc);
     if (nTab1 > 0)
-        CopyToDocument(0, 0, 0, MAXCOL, MAXROW, nTab1-1, InsertDeleteFlags::FORMULA, false, rDestDoc);
+        CopyToDocument(0, 0, 0, MaxCol(), MaxRow(), nTab1-1, InsertDeleteFlags::FORMULA, false, rDestDoc);
 
     SCTAB nMinSizeBothTabs = static_cast<SCTAB>(std::min(maTabs.size(), rDestDoc.maTabs.size()));
     for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++)
@@ -2154,7 +2154,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
     }
 
     if (nTab2 < static_cast<SCTAB>(maTabs.size()))
-        CopyToDocument(0, 0 , nTab2+1, MAXCOL, MAXROW, maTabs.size(), InsertDeleteFlags::FORMULA, false, rDestDoc);
+        CopyToDocument(0, 0 , nTab2+1, MaxCol(), MaxRow(), maTabs.size(), InsertDeleteFlags::FORMULA, false, rDestDoc);
 }
 
 void ScDocument::CopyToClip(const ScClipParam& rClipParam,
@@ -3792,7 +3792,7 @@ bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
         if( pData && pData->HasSelectionList() )
             return true;
     }
-    return HasStringCells( ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ) );
+    return HasStringCells( ScRange( nCol, 0, nTab, nCol, MaxRow(), nTab ) );
 }
 
 bool ScDocument::HasValidationData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
@@ -4276,7 +4276,7 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa
     for ( SCTAB nTab=0; nTab< static_cast<SCTAB>(maTabs.size()); nTab++ )
         if ( maTabs[nTab] && ( !pTabMark || pTabMark->GetTableSelect(nTab) ) )
         {
-            maTabs[nTab]->SetOptimalHeightOnly(rCxt, 0, MAXROW, &aProgress, nProgressStart);
+            maTabs[nTab]->SetOptimalHeightOnly(rCxt, 0, MaxRow(), &aProgress, nProgressStart);
             maTabs[nTab]->SetDrawPageSize();
             nProgressStart += maTabs[nTab]->GetWeightedCount();
         }
@@ -4585,14 +4585,14 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const
     {
         CRFlags nStartFlags = maTabs[nTab]->GetColFlags(nStart);
         sal_uInt16 nStartWidth = maTabs[nTab]->GetOriginalWidth(nStart);
-        for (SCCOL nCol : maTabs[nTab]->GetColumnsRange( nStart + 1, MAXCOL))
+        for (SCCOL nCol : maTabs[nTab]->GetColumnsRange( nStart + 1, MaxCol()))
         {
             if (((nStartFlags & CRFlags::ManualBreak) != (maTabs[nTab]->GetColFlags(nCol) & CRFlags::ManualBreak)) ||
                 (nStartWidth != maTabs[nTab]->GetOriginalWidth(nCol)) ||
                 ((nStartFlags & CRFlags::Hidden) != (maTabs[nTab]->GetColFlags(nCol) & CRFlags::Hidden)) )
                 return nCol;
         }
-        return MAXCOL+1;
+        return MaxCol()+1;
     }
     return 0;
 }
@@ -4620,7 +4620,7 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart) const
     bool bStartHidden = bHidden = maTabs[nTab]->RowHidden( nStart, nullptr, &nHiddenEndRow);
     sal_uInt16 nStartHeight = nHeight = maTabs[nTab]->GetRowHeight( nStart, nullptr, &nHeightEndRow, false);
     SCROW nRow;
-    while ((nRow = std::min( nHiddenEndRow, std::min( nFlagsEndRow, nHeightEndRow)) + 1) <= MAXROW)
+    while ((nRow = std::min( nHiddenEndRow, std::min( nFlagsEndRow, nHeightEndRow)) + 1) <= MaxRow())
     {
         if (nFlagsEndRow < nRow)
             nFlags = pRowFlagsArray->GetValue( nRow, nIndex, nFlagsEndRow);
@@ -4636,7 +4636,7 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart) const
             return nRow;
     }
 
-    return MAXROW+1;
+    return MaxRow()+1;
 }
 
 void ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault)
@@ -5254,13 +5254,13 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab,
         if ( ScHasPriority( pOther, pTopLine ) )
             pTopLine = pOther;
     }
-    if ( nCol < MAXCOL )
+    if ( nCol < MaxCol() )
     {
         const SvxBorderLine* pOther = GetEffItem( nCol+1, nRow, nTab, ATTR_BORDER )->GetLeft();
         if ( ScHasPriority( pOther, pRightLine ) )
             pRightLine = pOther;
     }
-    if ( nRow < MAXROW )
+    if ( nRow < MaxRow() )
     {
         const SvxBorderLine* pOther = GetEffItem( nCol, nRow+1, nTab, ATTR_BORDER )->GetTop();
         if ( ScHasPriority( pOther, pBottomLine ) )
@@ -5492,7 +5492,7 @@ void ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
                     bHorOverlapped = GetDefPattern()->GetItem(ATTR_MERGE_FLAG).IsHorOverlapped();
                 if ( bHorOverlapped )
                 {
-                    SCROW nEndRowSeg = (pAttrArray->Count()) ? pAttrArray->mvData[nIndex].nEndRow : MAXROW;
+                    SCROW nEndRowSeg = (pAttrArray->Count()) ? pAttrArray->mvData[nIndex].nEndRow : MaxRow();
                     SCROW nLoopEndRow = std::min( nEndRow, nEndRowSeg );
                     for (SCROW nAttrRow = nAttrPos; nAttrRow <= nLoopEndRow; nAttrRow++)
                     {
@@ -5510,7 +5510,7 @@ void ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
                     ++nIndex;
                 }
                 else
-                    nAttrPos = MAXROW + 1;
+                    nAttrPos = MaxRow() + 1;
             }
         }
     }
@@ -6666,7 +6666,7 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex ) const
 {
     for (size_t nTab = 0; nTab < maTabs.size(); ++nTab)
     {
-        for (SCCOL nCol : GetColumnsRange(nTab, 0, MAXCOL))
+        for (SCCOL nCol : GetColumnsRange(nTab, 0, MaxCol()))
         {
             size_t nColNoteCount = GetNoteCount(nTab, nCol);
             if (!nColNoteCount)
@@ -6693,7 +6693,7 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex ) const
 
 ScAddress ScDocument::GetNotePosition( size_t nIndex, SCTAB nTab ) const
 {
-    for (SCCOL nCol : GetColumnsRange(nTab, 0, MAXCOL))
+    for (SCCOL nCol : GetColumnsRange(nTab, 0, MaxCol()))
     {
         size_t nColNoteCount = GetNoteCount(nTab, nCol);
         if (!nColNoteCount)
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index d4c3227a8b72..e5c0cfbef37e 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -57,9 +57,9 @@ struct ScDocumentImportImpl
         maListenCxt(rDoc),
         mnDefaultScriptNumeric(SvtScriptType::UNKNOWN) {}
 
-    static bool isValid( size_t nTab, size_t nCol )
+    bool isValid( size_t nTab, size_t nCol )
     {
-        return (nTab <= size_t(MAXTAB) && nCol <= size_t(MAXCOL));
+        return (nTab <= size_t(MAXTAB) && nCol <= size_t(mrDoc.MaxCol()));
     }
 
     ColAttr* getColAttr( size_t nTab, size_t nCol )
@@ -139,7 +139,7 @@ void ScDocumentImport::setCellStyleToSheet(SCTAB nTab, const ScStyleSheet& rStyl
     if (!pTab)
         return;
 
-    pTab->ApplyStyleArea(0, 0, MAXCOL, MAXROW, rStyle);
+    pTab->ApplyStyleArea(0, 0, getDoc().MaxCol(), getDoc().MaxRow(), rStyle);
 }
 
 SCTAB ScDocumentImport::getSheetIndex(const OUString& rName) const
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b28ece90e404..0d53d2ad2bfa 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3856,7 +3856,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl(
                 else
                 {
                     nTab = lcl_FirstTab(aRanges);   //! multiple sheets?
-                    ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow );
+                    rDoc.GetSearchAndReplaceStart( *pSearchItem, nCol, nRow );
                 }
 
                 OUString aDummyUndo;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 17e1290eeb13..c026b077b8ec 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1985,7 +1985,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
                 else
                     SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::End);
 
-                ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow );
+                rDoc.GetSearchAndReplaceStart( *pSearchItem, nCol, nRow );
                 if (pSearchItem->GetBackward())
                     nTab = nEndTab;
                 else