alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC) 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@69508 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-02-28 00:32:55 +00:00
parent fb9a1e2ca8
commit cfaa5209f7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Classes/PHPExcel/Calculation.php
View File

@ -2531,7 +2531,7 @@ class PHPExcel_Calculation {
} }
if (is_null($value)) { if (is_null($value)) {
return 'a null value'; return 'a NULL value';
} elseif (is_float($value)) { } elseif (is_float($value)) {
$typeString = 'a floating point number'; $typeString = 'a floating point number';
} elseif(is_int($value)) { } elseif(is_int($value)) {
@ -2828,10 +2828,10 @@ class PHPExcel_Calculation {
$stack->push('Function', strtoupper($val)); $stack->push('Function', strtoupper($val));
$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch); $ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch);
if ($ax) { if ($ax) {
$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 0); $stack->push('Operand Count for Function '.strtoupper($val).')', 0);
$expectingOperator = true; $expectingOperator = true;
} else { } else {
$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 1); $stack->push('Operand Count for Function '.strtoupper($val).')', 1);
$expectingOperator = false; $expectingOperator = false;
} }
$stack->push('Brace', '('); $stack->push('Brace', '(');
@ -2925,7 +2925,7 @@ class PHPExcel_Calculation {
++$index; ++$index;
} elseif ($opCharacter == ')') { // miscellaneous error checking } elseif ($opCharacter == ')') { // miscellaneous error checking
if ($expectingOperand) { if ($expectingOperand) {
$output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null); $output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
$expectingOperand = false; $expectingOperand = false;
$expectingOperator = true; $expectingOperator = true;
} else { } else {

1
changelog.txt
View File

@ -72,6 +72,7 @@ Fixed in SVN:
- Bugfix: (MBaker) "i" is not a valid character for Excel date format masks (in isDateTimeFormatCode() method) - Bugfix: (MBaker) "i" is not a valid character for Excel date format masks (in isDateTimeFormatCode() method)
- Bugfix: (MKunert) Work item 15421 - PHPExcel_ReferenceHelper::insertNewBefore() is missing an 'Update worksheet: comments' section - Bugfix: (MKunert) Work item 15421 - PHPExcel_ReferenceHelper::insertNewBefore() is missing an 'Update worksheet: comments' section
- Bugfix: (MBaker) Work item 15409 - Full column/row references in named ranges not supported by updateCellReference() - Bugfix: (MBaker) Work item 15409 - Full column/row references in named ranges not supported by updateCellReference()
- General: (MBaker) Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
- General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer. - General: (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.
- General: (MBaker) Improved performance (speed), for PHP to Excel date conversions - General: (MBaker) Improved performance (speed), for PHP to Excel date conversions
- General: (MBaker) Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes. - General: (MBaker) Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes.