From ad8b80bae9a2432313e0c3baa23030e65840ad1f Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 12 Nov 2010 23:53:31 +0000 Subject: [PATCH] Bugfix: Workitem 14679 - Formula evaluation fails with Japanese sheet refs git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@63672 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Calculation.php | 2 +- changelog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php index ee64189f..8a1b8db9 100644 --- a/Classes/PHPExcel/Calculation.php +++ b/Classes/PHPExcel/Calculation.php @@ -66,7 +66,7 @@ class PHPExcel_Calculation { // Function const CALCULATION_REGEXP_FUNCTION = '@?([A-Z][A-Z0-9\.]*)[\s]*\('; // Cell reference (cell or range of cells, with or without a sheet reference) - const CALCULATION_REGEXP_CELLREF = '(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)'; + const CALCULATION_REGEXP_CELLREF = '((((?:\P{M}\p{M}*)+?)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)'; // Named Range of cells const CALCULATION_REGEXP_NAMEDRANGE = '(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9]*)'; // Error diff --git a/changelog.txt b/changelog.txt index 571234a1..d437d936 100644 --- a/changelog.txt +++ b/changelog.txt @@ -52,6 +52,7 @@ Fixed in SVN: These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats - Bugfix: (MBaker) Workitem 14374 - BUG : Excel5 and setReadFilter ? - Bugfix: (MBaker) Workitem 14425 - Wrong exception message while deleting column +- Bugfix: (MBaker) Workitem 14679 - Formula evaluation fails with Japanese sheet refs - General: (MBaker) Applied patch 6609 - Removes a unnecessary loop through each cell when applying conditional formatting to a range. - General: (MBaker) Applied patch 7169 - Removed spurious PHP end tags (?>) - General: (MBaker) Improved performance specifically for the Excel5 and Excel2007 Writers, but also some general improvement for all Writers