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

Rename a variable to something more meaningful.

Change-Id: I860e5301e3fec3f06f318b28787f71b63dbaf0ab
üst ff5d891b
...@@ -2100,7 +2100,7 @@ bool ScFormulaCell::UpdateReference( ...@@ -2100,7 +2100,7 @@ bool ScFormulaCell::UpdateReference(
if (pUndoDoc) if (pUndoDoc)
pOldCode.reset(pCode->Clone()); pOldCode.reset(pCode->Clone());
ScRangeData* pRangeData = NULL; ScRangeData* pSharedCode = NULL;
bool bValChanged = false; bool bValChanged = false;
bool bRangeModified = false; // any range, not only shared formula bool bRangeModified = false; // any range, not only shared formula
bool bRefSizeChanged = false; bool bRefSizeChanged = false;
...@@ -2110,7 +2110,7 @@ bool ScFormulaCell::UpdateReference( ...@@ -2110,7 +2110,7 @@ bool ScFormulaCell::UpdateReference(
// Update cell or range references. // Update cell or range references.
ScCompiler aComp(pDocument, aPos, *pCode); ScCompiler aComp(pDocument, aPos, *pCode);
aComp.SetGrammar(pDocument->GetGrammar()); aComp.SetGrammar(pDocument->GetGrammar());
pRangeData = aComp.UpdateReference(eUpdateRefMode, aOldPos, rRange, pSharedCode = aComp.UpdateReference(eUpdateRefMode, aOldPos, rRange,
nDx, nDy, nDz, nDx, nDy, nDz,
bValChanged, bRefSizeChanged); bValChanged, bRefSizeChanged);
bRangeModified = aComp.HasModifiedRange(); bRangeModified = aComp.HasModifiedRange();
...@@ -2215,7 +2215,7 @@ bool ScFormulaCell::UpdateReference( ...@@ -2215,7 +2215,7 @@ bool ScFormulaCell::UpdateReference(
bHasRelName = HasRelNameReference(); bHasRelName = HasRelNameReference();
// Reference changed and new listening needed? // Reference changed and new listening needed?
// Except in Insert/Delete without specialties. // Except in Insert/Delete without specialties.
bNewListening = (bRangeModified || pRangeData || bColRowNameCompile bNewListening = (bRangeModified || pSharedCode || bColRowNameCompile
|| (bValChanged && (eUpdateRefMode != URM_INSDEL || || (bValChanged && (eUpdateRefMode != URM_INSDEL ||
bInDeleteUndo || bRefSizeChanged)) || bInDeleteUndo || bRefSizeChanged)) ||
(bHasRelName && eUpdateRefMode != URM_COPY)) (bHasRelName && eUpdateRefMode != URM_COPY))
...@@ -2231,14 +2231,14 @@ bool ScFormulaCell::UpdateReference( ...@@ -2231,14 +2231,14 @@ bool ScFormulaCell::UpdateReference(
bool bNeedDirty = false; bool bNeedDirty = false;
// NeedDirty for changes except for Copy and Move/Insert without RelNames // NeedDirty for changes except for Copy and Move/Insert without RelNames
if ( bRangeModified || pRangeData || bColRowNameCompile || if ( bRangeModified || pSharedCode || bColRowNameCompile ||
(bValChanged && eUpdateRefMode != URM_COPY && (bValChanged && eUpdateRefMode != URM_COPY &&
(eUpdateRefMode != URM_MOVE || bHasRelName) && (eUpdateRefMode != URM_MOVE || bHasRelName) &&
(!bIsInsert || bHasRelName || bInDeleteUndo || (!bIsInsert || bHasRelName || bInDeleteUndo ||
bRefSizeChanged)) || bOnRefMove) bRefSizeChanged)) || bOnRefMove)
bNeedDirty = true; bNeedDirty = true;
if (pUndoDoc && (bValChanged || pRangeData || bOnRefMove)) if (pUndoDoc && (bValChanged || pSharedCode || bOnRefMove))
{ {
// Copy the cell to aUndoPos, which is its current position in the document, // Copy the cell to aUndoPos, which is its current position in the document,
// so this works when UpdateReference is called before moving the cells // so this works when UpdateReference is called before moving the cells
...@@ -2258,13 +2258,13 @@ bool ScFormulaCell::UpdateReference( ...@@ -2258,13 +2258,13 @@ bool ScFormulaCell::UpdateReference(
bValChanged = false; bValChanged = false;
if ( pRangeData ) if ( pSharedCode )
{ // Replace shared formula with own formula { // Replace shared formula with own formula
pDocument->RemoveFromFormulaTree( this ); // update formula count pDocument->RemoveFromFormulaTree( this ); // update formula count
delete pCode; delete pCode;
pCode = pRangeData->GetCode()->Clone(); pCode = pSharedCode->GetCode()->Clone();
// #i18937# #i110008# call MoveRelWrap, but with the old position // #i18937# #i110008# call MoveRelWrap, but with the old position
ScCompiler::MoveRelWrap(*pCode, pDocument, aOldPos, pRangeData->GetMaxCol(), pRangeData->GetMaxRow()); ScCompiler::MoveRelWrap(*pCode, pDocument, aOldPos, pSharedCode->GetMaxCol(), pSharedCode->GetMaxRow());
ScCompiler aComp2(pDocument, aPos, *pCode); ScCompiler aComp2(pDocument, aPos, *pCode);
aComp2.SetGrammar(pDocument->GetGrammar()); aComp2.SetGrammar(pDocument->GetGrammar());
aComp2.UpdateSharedFormulaReference( eUpdateRefMode, aOldPos, rRange, aComp2.UpdateSharedFormulaReference( eUpdateRefMode, aOldPos, rRange,
...@@ -2297,7 +2297,7 @@ bool ScFormulaCell::UpdateReference( ...@@ -2297,7 +2297,7 @@ bool ScFormulaCell::UpdateReference(
} }
} }
if ( bNeedDirty && (!(eUpdateRefMode == URM_INSDEL && bHasRelName) || pRangeData) ) if ( bNeedDirty && (!(eUpdateRefMode == URM_INSDEL && bHasRelName) || pSharedCode) )
{ // Cut off references, invalid or similar? { // Cut off references, invalid or similar?
sc::AutoCalcSwitch(*pDocument, false); sc::AutoCalcSwitch(*pDocument, false);
SetDirty(); SetDirty();
......
...@@ -4222,25 +4222,25 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, ...@@ -4222,25 +4222,25 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
} }
} }
// Check for SharedFormulas. // Check for SharedFormulas.
ScRangeData* pRangeData = NULL; ScRangeData* pSharedCode = NULL;
pArr->Reset(); pArr->Reset();
for( FormulaToken* j = pArr->GetNextName(); j && !pRangeData; for( FormulaToken* j = pArr->GetNextName(); j && !pSharedCode;
j = pArr->GetNextName() ) j = pArr->GetNextName() )
{ {
if( j->GetOpCode() == ocName ) if( j->GetOpCode() == ocName )
{ {
ScRangeData* pName = GetRangeData( *j); ScRangeData* pName = GetRangeData( *j);
if (pName && pName->HasType(RT_SHARED)) if (pName && pName->HasType(RT_SHARED))
pRangeData = pName; pSharedCode = pName;
} }
} }
// Check SharedFormulas for wraps. // Check SharedFormulas for wraps.
if (pRangeData) if (pSharedCode)
{ {
ScRangeData* pName = pRangeData; ScRangeData* pName = pSharedCode;
pRangeData = NULL; pSharedCode = NULL;
pArr->Reset(); pArr->Reset();
for( t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()); t && !pRangeData; for( t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()); t && !pSharedCode;
t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()) ) t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()) )
{ {
bool bRelName = (t->GetType() == svSingleRef ? bool bRelName = (t->GetType() == svSingleRef ?
...@@ -4257,16 +4257,16 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, ...@@ -4257,16 +4257,16 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
// wrapped it. Replace SharedFormula. // wrapped it. Replace SharedFormula.
if (!bValid) if (!bValid)
{ {
pRangeData = pName; pSharedCode = pName;
rChanged = true; rChanged = true;
} }
} }
} }
} }
return pRangeData; return pSharedCode;
} }
ScRangeData* pRangeData = NULL; ScRangeData* pSharedCode = NULL;
ScToken* t; ScToken* t;
pArr->Reset(); pArr->Reset();
while( (t = static_cast<ScToken*>(pArr->GetNextReferenceOrName())) != NULL ) while( (t = static_cast<ScToken*>(pArr->GetNextReferenceOrName())) != NULL )
...@@ -4276,7 +4276,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, ...@@ -4276,7 +4276,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
ScRangeData* pName = GetRangeData( *t); ScRangeData* pName = GetRangeData( *t);
if (pName && pName->HasType(RT_SHAREDMOD)) if (pName && pName->HasType(RT_SHAREDMOD))
{ {
pRangeData = pName; // maybe need a replacement of shared with own code pSharedCode = pName; // maybe need a replacement of shared with own code
rChanged = true; rChanged = true;
} }
} }
...@@ -4373,7 +4373,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, ...@@ -4373,7 +4373,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
} }
} }
return pRangeData; return pSharedCode;
} }
bool ScCompiler::UpdateNameReference(UpdateRefMode eUpdateRefMode, bool ScCompiler::UpdateNameReference(UpdateRefMode eUpdateRefMode,
......
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