RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-22 21:36:05 +03:00
Code Issues Projects Releases Wiki Activity

GH-347 Using $this in static context in Calculation engine

Browse Source
This commit is contained in:
Mark Baker 2014-03-28 23:59:38 +00:00
parent e69a5e4d0f
commit 0042e47c0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Calculation.php
View File

@ -2640,7 +2640,7 @@ class PHPExcel_Calculation {
} // function _showTypeDetails() } // function _showTypeDetails()
private static function _convertMatrixReferences($formula) { private function _convertMatrixReferences($formula) {
static $matrixReplaceFrom = array('{',';','}'); static $matrixReplaceFrom = array('{',';','}');
static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))'); static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))');
@ -2729,7 +2729,7 @@ class PHPExcel_Calculation {
// Convert infix to postfix notation // Convert infix to postfix notation
private function _parseFormula($formula, PHPExcel_Cell $pCell = NULL) { private function _parseFormula($formula, PHPExcel_Cell $pCell = NULL) {
if (($formula = self::_convertMatrixReferences(trim($formula))) === FALSE) { if (($formula = $this->_convertMatrixReferences(trim($formula))) === FALSE) {
return FALSE; return FALSE;
} }