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

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
This commit is contained in:
Mark Baker 2010-11-12 23:53:31 +00:00
parent 3bd1ef536d
commit ad8b80bae9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/PHPExcel/Calculation.php
View File

@ -66,7 +66,7 @@ class PHPExcel_Calculation {
// Function // Function
const CALCULATION_REGEXP_FUNCTION = '@?([A-Z][A-Z0-9\.]*)[\s]*\('; const CALCULATION_REGEXP_FUNCTION = '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
// Cell reference (cell or range of cells, with or without a sheet reference) // 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 // Named Range of cells
const CALCULATION_REGEXP_NAMEDRANGE = '(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9]*)'; const CALCULATION_REGEXP_NAMEDRANGE = '(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9]*)';
// Error // Error

1
changelog.txt
View File

@ -52,6 +52,7 @@ Fixed in SVN:
These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats 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 14374 - BUG : Excel5 and setReadFilter ?
- Bugfix: (MBaker) Workitem 14425 - Wrong exception message while deleting column - 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 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) 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 - General: (MBaker) Improved performance specifically for the Excel5 and Excel2007 Writers, but also some general improvement for all Writers