From 9c6287a323d9899ffbbd37dfe357d1d1212c998a Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Mon, 18 Nov 2013 14:20:37 +0000 Subject: [PATCH] Bugfix: (IndrekHaav) Work Item GH-212 - Fix for formulae that reference a sheet whose name begins with a digit: these were erroneously identified as numeric values, causing the parser to throw an undefined variable error. --- Classes/PHPExcel/Calculation.php | 2 +- changelog.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php index 01cfb7cf..152c98e1 100644 --- a/Classes/PHPExcel/Calculation.php +++ b/Classes/PHPExcel/Calculation.php @@ -2738,10 +2738,10 @@ class PHPExcel_Calculation { $pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL; $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION. + '|'.self::CALCULATION_REGEXP_CELLREF. '|'.self::CALCULATION_REGEXP_NUMBER. '|'.self::CALCULATION_REGEXP_STRING. '|'.self::CALCULATION_REGEXP_OPENBRACE. - '|'.self::CALCULATION_REGEXP_CELLREF. '|'.self::CALCULATION_REGEXP_NAMEDRANGE. '|'.self::CALCULATION_REGEXP_ERROR. ')/si'; diff --git a/changelog.txt b/changelog.txt index 6340623e..13b7964e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -34,6 +34,8 @@ Fixed in develop branch for release v1.8.0: - Bugfix: (RomanSyroeshko) Work Item GH-267 - CHOOSE() returns "#VALUE!" if the 1st entry is chosen - Bugfix: (Gemorroj) Work Item GH-268 - When duplicating styles, styles shifted by one column to the right Fix also applied to duplicating conditional styles +- Bugfix: (IndrekHaav) Work Item GH-212 - Fix for formulae that reference a sheet whose name begins with a digit: + these were erroneously identified as numeric values, causing the parser to throw an undefined variable error. - Feature: (amerov) - Implementation of the Excel HLOOKUP() function - Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) - Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer