summaryrefslogtreecommitdiff
path: root/sc/source/core/tool/rangenam.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-12 16:53:45 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-09-13 15:17:36 +0200
commitfb2ceb28a820e7775456a137541ef5978a6746b4 (patch)
tree10a82d1c0007d01c0efa10826e5bb78729d3f6c9 /sc/source/core/tool/rangenam.cxx
parent0dcebd1b6e2e6f03d83bc46cab7be42a8905df3c (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/rangenam.cxx')
-rw-r--r--sc/source/core/tool/rangenam.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index f96cdbe0dec6..956f9439f902 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -292,7 +292,7 @@ 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(pDoc, aPos);
+ ScRange aAbs = rRef.toAbs(*pDoc, aPos);
if (ScRefUpdate::UpdateTranspose(pDoc, rSource, rDest, aAbs) != UR_NOTHING)
{
rRef.SetRange(pDoc->GetSheetLimits(), aAbs, aPos);
@@ -324,7 +324,7 @@ 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(pDoc, aPos);
+ ScRange aAbs = rRef.toAbs(*pDoc, aPos);
if (ScRefUpdate::UpdateGrow(rArea, nGrowX, nGrowY, aAbs) != UR_NOTHING)
{
rRef.SetRange(pDoc->GetSheetLimits(), aAbs, aPos);
@@ -533,7 +533,7 @@ void ScRangeData::ValidateTabRefs()
while ( ( t = aIter.GetNextReference() ) != nullptr )
{
ScSingleRefData& rRef1 = *t->GetSingleRef();
- ScAddress aAbs = rRef1.toAbs(pDoc, 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(pDoc, aPos);
+ aAbs = rRef2.toAbs(*pDoc, aPos);
if ( rRef2.IsTabRel() && !rRef2.IsTabDeleted() )
{
if (aAbs.Tab() < nMinTab)
@@ -576,7 +576,7 @@ void ScRangeData::ValidateTabRefs()
ScSingleRefData& rRef = *t->GetSingleRef();
if (!rRef.IsTabDeleted())
{
- ScAddress aAbs = rRef.toAbs(pDoc, aOldPos);
+ ScAddress aAbs = rRef.toAbs(*pDoc, aOldPos);
rRef.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos);
}
}
@@ -586,12 +586,12 @@ void ScRangeData::ValidateTabRefs()
ScComplexRefData& rRef = *t->GetDoubleRef();
if (!rRef.Ref1.IsTabDeleted())
{
- ScAddress aAbs = rRef.Ref1.toAbs(pDoc, aOldPos);
+ ScAddress aAbs = rRef.Ref1.toAbs(*pDoc, aOldPos);
rRef.Ref1.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos);
}
if (!rRef.Ref2.IsTabDeleted())
{
- ScAddress aAbs = rRef.Ref2.toAbs(pDoc, aOldPos);
+ ScAddress aAbs = rRef.Ref2.toAbs(*pDoc, aOldPos);
rRef.Ref2.SetAddress(pDoc->GetSheetLimits(), aAbs, aPos);
}
}