diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2022-02-19 10:29:32 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2022-02-19 12:42:54 +0100 |
commit | 725e1066cbe3bbd6759b3e7396bc5d0ecb55a504 (patch) | |
tree | f9696901a0ba16cd31dba2521ea65c9cba6c683d /sc/source/ui | |
parent | 6f938dce6eaa927cfde39491ef7a0bc1d07df66b (diff) |
remove MAXCOL/MAXROW from ScAddress/ScRange (tdf#147509)
Change-Id: I4e80bba8b866f9915a6600ce67774380e619c2e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130188
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 8ce57f1f832f..dac09e465ae3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1749,7 +1749,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, if ( eCmd == INS_INSROWS_AFTER ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - if (!aTargetRange.Move(0, rRange.aEnd.Row() - rRange.aStart.Row() + 1, 0, aErrorRange)) + if (!aTargetRange.Move(0, rRange.aEnd.Row() - rRange.aStart.Row() + 1, 0, aErrorRange, rDoc)) { return false; } @@ -1757,7 +1757,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, if ( eCmd == INS_INSCOLS_AFTER ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - if (!aTargetRange.Move(rRange.aEnd.Col() - rRange.aStart.Col() + 1, 0, 0, aErrorRange)) + if (!aTargetRange.Move(rRange.aEnd.Col() - rRange.aStart.Col() + 1, 0, 0, aErrorRange, rDoc)) { return false; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 97e37f852542..1357a543659c 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4477,14 +4477,14 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos nDestPosX == aSource.aStart.Col() && nDestPosY < aSource.aStart.Row() ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - bDone = aSource.Move( 0, nSizeY, 0, aErrorRange, pSourceDoc ); + bDone = aSource.Move( 0, nSizeY, 0, aErrorRange, *pSourceDoc ); nCorrectCursorPosRow = nSizeY; } else if ( meDragInsertMode == INS_CELLSRIGHT && nDestPosY == aSource.aStart.Row() && nDestPosX < aSource.aStart.Col() ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - bDone = aSource.Move( nSizeX, 0, 0, aErrorRange, pSourceDoc ); + bDone = aSource.Move( nSizeX, 0, 0, aErrorRange, *pSourceDoc ); nCorrectCursorPosCol = nSizeX; } } @@ -4527,12 +4527,12 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if ( eCmd == DelCellCmd::CellsUp && nDestPosY > aSource.aEnd.Row() ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - bDone = aDest.Move( 0, -nSizeY, 0, aErrorRange, &rThisDoc ); + bDone = aDest.Move( 0, -nSizeY, 0, aErrorRange, rThisDoc ); } else if ( eCmd == DelCellCmd::CellsLeft && nDestPosX > aSource.aEnd.Col() ) { ScRange aErrorRange( ScAddress::UNINITIALIZED ); - bDone = aDest.Move( -nSizeX, 0, 0, aErrorRange, &rThisDoc ); + bDone = aDest.Move( -nSizeX, 0, 0, aErrorRange, rThisDoc ); } pDocSh->UpdateOle(mrViewData); pView->CellContentChanged(); |