Kaydet (Commit) d46203b5 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#95748 no group interpreter when calculations are running

Change-Id: I17283fc5e39da2d7222c302dd63522df69d0ad96
üst 87ad1705
......@@ -1551,15 +1551,24 @@ void ScFormulaCell::Interpret()
}
else
{
// Do not attempt to interpret a group when calculations are already
// running, otherwise we may run into a circular reference hell. See
// tdf#95748
if (rRecursionHelper.GetRecursionCount())
InterpretTail( SCITP_NORMAL);
else
{
#if DEBUG_CALCULATION
aDC.enterGroup();
#endif
bool bGroupInterpreted = InterpretFormulaGroup();
#if DEBUG_CALCULATION
aDC.leaveGroup();
aDC.enterGroup();
bool bGroupInterpreted = InterpretFormulaGroup();
aDC.leaveGroup();
if (!bGroupInterpreted)
InterpretTail( SCITP_NORMAL);
#else
if (!InterpretFormulaGroup())
InterpretTail( SCITP_NORMAL);
#endif
if (!bGroupInterpreted)
InterpretTail( SCITP_NORMAL);
}
}
// While leaving a recursion or iteration stack, insert its cells to the
......
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