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

Minor fixes for strict standards

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@86471 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2012-02-14 13:48:09 +00:00
parent ffb8ccc362
commit b18939b29d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Classes/PHPExcel/Calculation.php
View File

@ -2517,7 +2517,7 @@ class PHPExcel_Calculation {
return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE']; return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
} }
} }
return $value; return PHPExcel_Calculation_Functions::flattenSingleValue($value);
} // function _showValue() } // function _showValue()
@ -2977,7 +2977,8 @@ class PHPExcel_Calculation {
} }
while (($op = $stack->pop()) !== NULL) { // pop everything off the stack and push onto output while (($op = $stack->pop()) !== NULL) { // pop everything off the stack and push onto output
if ($opCharacter['value'] == '(') return $this->_raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '('))
return $this->_raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced
$output[] = $op; $output[] = $op;
} }
return $output; return $output;
@ -3008,16 +3009,20 @@ class PHPExcel_Calculation {
$operand1 = $operand1Data['value']; $operand1 = $operand1Data['value'];
if (($operand1Data['reference'] === NULL) && (is_array($operand1))) { if (($operand1Data['reference'] === NULL) && (is_array($operand1))) {
$rowKey = array_shift(array_keys($operand1)); $rKeys = array_keys($operand1);
$colKey = array_shift(array_keys($operand1[$rowKey])); $rowKey = array_shift($rKeys);
$cKeys = array_keys(array_keys($operand1[$rowKey]));
$colKey = array_shift($cKeys);
if (ctype_upper($colKey)) { if (ctype_upper($colKey)) {
$operand1Data['reference'] = $colKey.$rowKey; $operand1Data['reference'] = $colKey.$rowKey;
} }
} }
$operand2 = $operand2Data['value']; $operand2 = $operand2Data['value'];
if (($operand2Data['reference'] === NULL) && (is_array($operand2))) { if (($operand2Data['reference'] === NULL) && (is_array($operand2))) {
$rowKey = array_shift(array_keys($operand2)); $rKeys = array_keys($operand2);
$colKey = array_shift(array_keys($operand2[$rowKey])); $rowKey = array_shift($rKeys);
$cKeys = array_keys(array_keys($operand1[$rowKey]));
$colKey = array_shift($cKeys);
if (ctype_upper($colKey)) { if (ctype_upper($colKey)) {
$operand2Data['reference'] = $colKey.$rowKey; $operand2Data['reference'] = $colKey.$rowKey;
} }