AstValue value = ((SpreadsheetFormula)content).value;\r
if(this.inProgress == true) this.iterations++;\r
\r
- if(env.iterationEnabled == false){\r
+ if(!env.getBook().isIterationEnabled()){\r
if(this.inProgress == false){\r
this.inProgress = true;\r
f.result = value.accept(visitor);\r
}\r
else f.result = FormulaError2.CIRCULAR_REF.getString();\r
}\r
- else if(iterations<env.iterationLimit){\r
+ else if(this.iterations<env.iterationLimit){\r
this.inProgress = true;\r
f.result = value.accept(visitor);\r
}\r
- else f.result = 0.0;\r
+ else {\r
+ if(f.result==null)\r
+ f.result = 0.0;\r
+ }\r
\r
env.getBook().registerReferences(makeReferenceKey(), visitor.getReferences());\r
}\r
this.inProgress = false;\r
+ this.iterations = 0;\r
return (T)f.result;\r
} else if (content instanceof SpreadsheetSCLConstant) {\r
SpreadsheetSCLConstant sclConstant = (SpreadsheetSCLConstant) content;\r