diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-22 17:09:03 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-23 09:30:09 +0200 |
| commit | 19d2f4211928de8cae2d46a8161f2d9081371785 (patch) | |
| tree | 3e2313b9c5b84ddd52609b61467f1a4200c7d891 /sc/source/core/data/conditio.cxx | |
| parent | 7281580ef0cdfa1ba0858f1f918a6735108d124f (diff) | |
Make ScToken::GetSingleRef etc. return * instead of &
...so that default implementations can return nullptr without further ado
Change-Id: Idc8778fe868efa00b1de597a54aa07a2e6fa3bc0
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 10170970e4ca..f9a979606b15 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -89,7 +89,7 @@ static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 { case svDoubleRef: { - ScSingleRefData& rRef2 = static_cast<ScToken*>(t)->GetDoubleRef().Ref2; + ScSingleRefData& rRef2 = static_cast<ScToken*>(t)->GetDoubleRef()->Ref2; if ( rRef2.IsColRel() || rRef2.IsRowRel() || rRef2.IsTabRel() ) return true; } @@ -97,7 +97,7 @@ static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 case svSingleRef: { - ScSingleRefData& rRef1 = static_cast<ScToken*>(t)->GetSingleRef(); + ScSingleRefData& rRef1 = *static_cast<ScToken*>(t)->GetSingleRef(); if ( rRef1.IsColRel() || rRef1.IsRowRel() || rRef1.IsTabRel() ) return true; } @@ -1452,7 +1452,7 @@ ScAddress ScConditionEntry::GetValidSrcPos() const ScToken* t; while ( ( t = static_cast<ScToken*>(pFormula->GetNextReference()) ) != NULL ) { - ScSingleRefData& rRef1 = t->GetSingleRef(); + ScSingleRefData& rRef1 = *t->GetSingleRef(); ScAddress aAbs = rRef1.toAbs(aSrcPos); if (!rRef1.IsTabDeleted()) { @@ -1463,7 +1463,7 @@ ScAddress ScConditionEntry::GetValidSrcPos() const } if ( t->GetType() == svDoubleRef ) { - ScSingleRefData& rRef2 = t->GetDoubleRef().Ref2; + ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2; aAbs = rRef2.toAbs(aSrcPos); if (!rRef2.IsTabDeleted()) { |