Fix to allow calculate formula against a workbook, without passing in…

… a cell
khaderDevloper · Sep 17, 2015 · 49d123e · 49d123e
1 parent f6a2107
commit 49d123e
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php
@@ -2720,19 +2720,27 @@ public function calculateFormula($formula, $cellID = null, PHPExcel_Cell $pCell
         $this->_debugLog->clearLog();
         $this->cyclicReferenceStack->clear();
 
-        //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
-        //    But don't actually flush any cache
-        $resetCache = $this->getCalculationCacheEnabled();
-        $this->calculationCacheEnabled = false;
+        if ($this->workbook !== null && $cellID === null && $pCell === null) {
+            $cellID = 'A1';
+            $pCell = $this->workbook->getActiveSheet()->getCell($cellID);
+        } else {
+            //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
+            //    But don't actually flush any cache
+            $resetCache = $this->getCalculationCacheEnabled();
+            $this->calculationCacheEnabled = false;
+        }
+
         //    Execute the calculation
         try {
             $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
         } catch (PHPExcel_Exception $e) {
             throw new PHPExcel_Calculation_Exception($e->getMessage());
         }
 
-        //    Reset calculation cacheing to its previous state
-        $this->calculationCacheEnabled = $resetCache;
+        if ($this->workbook === null) {
+            //    Reset calculation cacheing to its previous state
+            $this->calculationCacheEnabled = $resetCache;
+        }
 
         return $result;
     }