mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#83901: ROW() and COLUMN() to be properly recalculated on cell move.

Browse Source 
For cases where ROW or COLUMN references another cell that has shifted.

Change-Id: Ic4bef8672dab811ceff6886d9af0388306a66485
This commit is contained in:
Kohei Yoshida
2014-10-12 10:18:09 -04:00
parent bf8876bb7e
commit 0b29a16d1d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sc/source/core/data/column.cxx
View File

@@ -2044,6 +2044,12 @@ class UpdateRefOnNonCopy : std::unary_function<sc::FormulaGroupEntry, void>
if (pCode->IsRecalcModeOnRefMove()) if (pCode->IsRecalcModeOnRefMove())
aRes.mbValueChanged = true; aRes.mbValueChanged = true;
} }
else if (aRes.mbReferenceModified && pCode->IsRecalcModeOnRefMove())
{
// The cell itself hasn't shifted. But it may have ROW or COLUMN
// referencing another cell that has.
aRes.mbValueChanged = true;
}
if (aRes.mbNameModified) if (aRes.mbNameModified)
recompileTokenArray(*pTop); recompileTokenArray(*pTop);

2
sc/source/core/data/formulacell.cxx
View File

@@ -2788,7 +2788,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
if (bOnRefMove) if (bOnRefMove)
// Cell may reference itself, e.g. ocColumn, ocRow without parameter // Cell may reference itself, e.g. ocColumn, ocRow without parameter
bOnRefMove = (bValChanged || (aPos != aOldPos)); bOnRefMove = (bValChanged || (aPos != aOldPos) || bRefModified);
bool bNewListening = false; bool bNewListening = false;
bool bInDeleteUndo = false; bool bInDeleteUndo = false;