From cfaa5209f7df3f10a4868dfea9020f8991fb9a69 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Mon, 28 Feb 2011 00:32:55 +0000
Subject: [PATCH] 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
---
 Classes/PHPExcel/Calculation.php | 8 ++++----
 changelog.txt                    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php
index 51cbbbcb..c2a304bd 100644
--- a/Classes/PHPExcel/Calculation.php
+++ b/Classes/PHPExcel/Calculation.php
@@ -2531,7 +2531,7 @@ class PHPExcel_Calculation {
 			}
 
 			if (is_null($value)) {
-				return 'a null value';
+				return 'a NULL value';
 			} elseif (is_float($value)) {
 				$typeString = 'a floating point number';
 			} elseif(is_int($value)) {
@@ -2828,10 +2828,10 @@ class PHPExcel_Calculation {
 						$stack->push('Function', strtoupper($val));
 						$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch);
 						if ($ax) {
-							$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 0);
+							$stack->push('Operand Count for Function '.strtoupper($val).')', 0);
 							$expectingOperator = true;
 						} else {
-							$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 1);
+							$stack->push('Operand Count for Function '.strtoupper($val).')', 1);
 							$expectingOperator = false;
 						}
 						$stack->push('Brace', '(');
@@ -2925,7 +2925,7 @@ class PHPExcel_Calculation {
 				++$index;
 			} elseif ($opCharacter == ')') {	// miscellaneous error checking
 				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;
 					$expectingOperator = true;
 				} else {
diff --git a/changelog.txt b/changelog.txt
index f3e0d595..a3314525 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -72,6 +72,7 @@ Fixed in SVN:
 - 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:	(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 PHP to Excel date conversions
 - General:  (MBaker) Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes.