mirror of
https://github.com/retailcrm/PHPExcel.git
synced 2024-11-26 07:16:03 +03:00
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@61245 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
parent
06535cc296
commit
f93fde9b38
@ -1345,7 +1345,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 == '') {
|
||||||
|
Loading…
Reference in New Issue
Block a user