diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-12 16:53:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-13 15:17:36 +0200 |
| commit | fb2ceb28a820e7775456a137541ef5978a6746b4 (patch) | |
| tree | 10a82d1c0007d01c0efa10826e5bb78729d3f6c9 /sc/source/core/tool/interpr1.cxx | |
| parent | 0dcebd1b6e2e6f03d83bc46cab7be42a8905df3c (diff) | |
toAbs always dereferences its ScDocument*
Change-Id: I6bddbca2289074ecf333227b3fc1a49da4b431a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102529
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/core/tool/interpr1.cxx')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 1493b56d241d..121f17757b45 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4247,7 +4247,7 @@ void ScInterpreter::ScColumns() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1) * static_cast<sal_uLong>(aAbs.aEnd.Col() - aAbs.aStart.Col() + 1); } @@ -4304,7 +4304,7 @@ void ScInterpreter::ScRows() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1) * static_cast<sal_uLong>(aAbs.aEnd.Row() - aAbs.aStart.Row() + 1); } @@ -4351,7 +4351,7 @@ void ScInterpreter::ScSheets() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nVal += static_cast<sal_uLong>(aAbs.aEnd.Tab() - aAbs.aStart.Tab() + 1); } break; @@ -4416,7 +4416,7 @@ void ScInterpreter::ScColumn() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef( nFileId, aTabName, aRef ); - ScAddress aAbsRef = aRef.toAbs(&mrDoc, aPos); + ScAddress aAbsRef = aRef.toAbs(mrDoc, aPos); nVal = static_cast<double>( aAbsRef.Col() + 1 ); } break; @@ -4440,7 +4440,7 @@ void ScInterpreter::ScColumn() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef ); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nCol1 = aAbs.aStart.Col(); nCol2 = aAbs.aEnd.Col(); } @@ -4520,7 +4520,7 @@ void ScInterpreter::ScRow() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef( nFileId, aTabName, aRef ); - ScAddress aAbsRef = aRef.toAbs(&mrDoc, aPos); + ScAddress aAbsRef = aRef.toAbs(mrDoc, aPos); nVal = static_cast<double>( aAbsRef.Row() + 1 ); } break; @@ -4543,7 +4543,7 @@ void ScInterpreter::ScRow() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef( nFileId, aTabName, aRef ); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nRow1 = aAbs.aStart.Row(); nRow2 = aAbs.aEnd.Row(); } @@ -8415,7 +8415,7 @@ void ScInterpreter::ScOffset() OUString aTabName; ScSingleRefData aRef; PopExternalSingleRef(nFileId, aTabName, aRef); - ScAddress aAbsRef = aRef.toAbs(&mrDoc, aPos); + ScAddress aAbsRef = aRef.toAbs(mrDoc, aPos); nCol1 = aAbsRef.Col(); nRow1 = aAbsRef.Row(); nTab1 = aAbsRef.Tab(); @@ -8468,7 +8468,7 @@ void ScInterpreter::ScOffset() OUString aTabName; ScComplexRefData aRef; PopExternalDoubleRef(nFileId, aTabName, aRef); - ScRange aAbs = aRef.toAbs(&mrDoc, aPos); + ScRange aAbs = aRef.toAbs(mrDoc, aPos); nCol1 = aAbs.aStart.Col(); nRow1 = aAbs.aStart.Row(); nTab1 = aAbs.aStart.Tab(); |