General: Set default Cyclic Reference behaviour to 1 to eliminate exc…

…eption when using a single cyclic iteration in formulae
omcrn · Dec 3, 2014 · 0296daa · 0296daa
1 parent 2b389f9
commit 0296daa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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 @@ public function calculateCellValue(PHPExcel_Cell $pCell = NULL, $resetLog = TRUE
 			$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
@@ -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