RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-26 07:16:03 +03:00
Code Issues Projects Releases Wiki Activity

Bugfix: Workitem 14086 - Named range with sheet name that contains the $ throws exception when getting the cell

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@61241 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2010-09-20 14:47:57 +00:00
parent 6925afdb91
commit 06535cc296
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Reader/Excel2007.php
View File

@ -1278,7 +1278,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
// Extract range // Extract range
$extractedRange = (string)$definedName; $extractedRange = (string)$definedName;
$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange); $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
$extractedRange = str_replace('$', '', $extractedRange); if (($spos = strpos($extractedRange,'!')) !== false) {
$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
} else {
$extractedRange = str_replace('$', '', $extractedRange);
}
// Valid range? // Valid range?
if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') { if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {

1
changelog.txt
View File

@ -43,6 +43,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Workitem 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist) - Bugfix: (MBaker) Workitem 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist)
- Bugfix: (MBaker) Workitems 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou) - Bugfix: (MBaker) Workitems 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou)
- Bugfix: (MBaker) Workitem 14256 - Worksheet title exception when duplicate worksheet is being renamed but exceeds the 31 character limit - Bugfix: (MBaker) Workitem 14256 - Worksheet title exception when duplicate worksheet is being renamed but exceeds the 31 character limit
- Bugfix: (MBaker) Workitem 14086 - Named range with sheet name that contains the $ throws exception when getting the cell
2010-08-26 (v1.7.4): 2010-08-26 (v1.7.4):