correcting ranges for fomulas
git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@116159 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
6f58c63fda
commit
5244cffc68
|
|
@ -789,20 +789,20 @@ class Parser extends PEAR
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// if it's a reference
|
// if it's a reference
|
||||||
if(eregi("^[A-Z][0-9]+$",$token) and
|
if(eregi("^[A-I]?[A-Z][0-9]+$",$token) and
|
||||||
!ereg("[0-9]",$this->_lookahead) and
|
!ereg("[0-9]",$this->_lookahead) and
|
||||||
($this->_lookahead != ':') and ($this->_lookahead != '.'))
|
($this->_lookahead != ':') and ($this->_lookahead != '.'))
|
||||||
{
|
{
|
||||||
return($token);
|
return($token);
|
||||||
}
|
}
|
||||||
// if it's a range (A1:A2)
|
// if it's a range (A1:A2)
|
||||||
elseif(eregi("^[A-Z]?[A-Z][0-9]+:[A-Z]?[A-Z][0-9]+$",$token) and
|
elseif(eregi("^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$token) and
|
||||||
!ereg("[0-9]",$this->_lookahead))
|
!ereg("[0-9]",$this->_lookahead))
|
||||||
{
|
{
|
||||||
return($token);
|
return($token);
|
||||||
}
|
}
|
||||||
// if it's a range (A1..A2)
|
// if it's a range (A1..A2)
|
||||||
elseif(eregi("^[A-Z]?[A-Z][0-9]+\.\.[A-Z]?[A-Z][0-9]+$",$token) and
|
elseif(eregi("^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$",$token) and
|
||||||
!ereg("[0-9]",$this->_lookahead))
|
!ereg("[0-9]",$this->_lookahead))
|
||||||
{
|
{
|
||||||
return($token);
|
return($token);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue