From 0296daa75c9cd29880a13efa66037e050534550f Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Wed, 3 Dec 2014 08:05:25 +0000 Subject: [PATCH] General: Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae --- Classes/PHPExcel/Calculation.php | 4 ++-- changelog.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php index fa89671f..9a0bf0f0 100644 --- a/Classes/PHPExcel/Calculation.php +++ b/Classes/PHPExcel/Calculation.php @@ -214,7 +214,7 @@ class PHPExcel_Calculation { * @var integer * */ - public $cyclicFormulaCount = 0; + public $cyclicFormulaCount = 1; /** * Precision used for calculations @@ -2236,7 +2236,7 @@ class PHPExcel_Calculation { $this->formulaError = null; $this->_debugLog->clearLog(); $this->_cyclicReferenceStack->clear(); - $this->_cyclicFormulaCount = 1; + $this->_cyclicFormulaCount = 0; self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY; } diff --git a/changelog.txt b/changelog.txt index a60cea7d..ed9eaa64 100644 --- a/changelog.txt +++ b/changelog.txt @@ -41,6 +41,7 @@ Planned for v1.8.1 - General: (frost-nzcr4) Work Item GH-379 - Change the getter/setter for zeroHeight to camel case - General: (MBaker) Work Item GH-394 - DefaultValueBinder is too much aggressive when converting string to numeric - General: (MBaker) - Default precalculate formulas to false for writers +- General: (MBaker) - Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae - Feature: (WiktrzGE) Work Item GH-404 - Methods to manage most of the existing options for Chart Axis, Major Grid-lines and Minor Grid-lines - Feature: (frost-nzcr4) Work Item GH-403 - ODS read/write comments in the cell - Feature: (CQD) Work Item GH-389 - Additional Mac CJK codepage definitions