Bugfix: Workitem 14086 - Named range with sheet name that contains the $ throws exception when getting the cell
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@61241 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
parent
6925afdb91
commit
06535cc296
|
@ -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);
|
||||||
|
if (($spos = strpos($extractedRange,'!')) !== false) {
|
||||||
|
$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
|
||||||
|
} else {
|
||||||
$extractedRange = str_replace('$', '', $extractedRange);
|
$extractedRange = str_replace('$', '', $extractedRange);
|
||||||
|
}
|
||||||
|
|
||||||
// Valid range?
|
// Valid range?
|
||||||
if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
|
if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
|
||||||
|
|
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue