Kaydet (Commit) 3ddb748a authored tarafından Kohei Yoshida's avatar Kohei Yoshida

More on avoiding direct access to reference data members.

Change-Id: I313c6504d7c0beeb68318ce436b48fa900e4cf48
üst 15a2574d
......@@ -1430,22 +1430,24 @@ ScAddress ScConditionEntry::GetValidSrcPos() const
while ( ( t = static_cast<ScToken*>(pFormula->GetNextReference()) ) != NULL )
{
ScSingleRefData& rRef1 = t->GetSingleRef();
if ( rRef1.IsTabRel() && !rRef1.IsTabDeleted() )
ScAddress aAbs = rRef1.toAbs(aSrcPos);
if (!rRef1.IsTabDeleted())
{
if ( rRef1.nTab < nMinTab )
nMinTab = rRef1.nTab;
if ( rRef1.nTab > nMaxTab )
nMaxTab = rRef1.nTab;
if (aAbs.Tab() < nMinTab)
nMinTab = aAbs.Tab();
if (aAbs.Tab() > nMaxTab)
nMaxTab = aAbs.Tab();
}
if ( t->GetType() == svDoubleRef )
{
ScSingleRefData& rRef2 = t->GetDoubleRef().Ref2;
if ( rRef2.IsTabRel() && !rRef2.IsTabDeleted() )
aAbs = rRef2.toAbs(aSrcPos);
if (!rRef2.IsTabDeleted())
{
if ( rRef2.nTab < nMinTab )
nMinTab = rRef2.nTab;
if ( rRef2.nTab > nMaxTab )
nMaxTab = rRef2.nTab;
if (aAbs.Tab() < nMinTab)
nMinTab = aAbs.Tab();
if (aAbs.Tab() > nMaxTab)
nMaxTab = aAbs.Tab();
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment