cvs: pear /Spreadsheet_Excel_Writer/Writer Parser.php
| From: | Xavier Noguer Gallego | Date: | Tue, 08 Nov 2005 00:22:38 +0000 |
| Subject: | cvs: pear /Spreadsheet_Excel_Writer/Writer Parser.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-36143@lists.php.net to get a copy of this message | ||
xnoguer Mon Nov 7 19:22:38 2005 EDT
Modified files:
/pear/Spreadsheet_Excel_Writer/Writer Parser.php
Log:
fixing bug #2876 (bieniek at dotzilla dot de). This will require php >= 4.1.0 on unix or php
>= 4.2.3 on win.
http://cvs.php.net/diff.php/pear/Spreadsheet_Excel_Writer/Writer/Parser.php?r1=1.51&r2=1.52&ty=u
Index: pear/Spreadsheet_Excel_Writer/Writer/Parser.php
diff -u pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.51
pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.52
--- pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.51 Mon Nov 7 18:26:10 2005
+++ pear/Spreadsheet_Excel_Writer/Writer/Parser.php Mon Nov 7 19:22:35 2005
@@ -552,12 +552,12 @@
return $this->_convertRef2d($token);
}
// match external references like Sheet1!A1 or Sheet1:Sheet2!A1
- elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z](\d+)$/",$token))
+ elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z](\d+)$/u",$token))
{
return $this->_convertRef3d($token);
}
// match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z](\d+)$/",$token))
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z](\d+)$/u",$token))
{
return $this->_convertRef3d($token);
}
@@ -572,12 +572,12 @@
return $this->_convertRange2d($token);
}
// match external ranges like Sheet1!A1 or Sheet1:Sheet2!A1:B2
- elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/",$token))
+ elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token))
{
return $this->_convertRange3d($token);
}
// match external ranges like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1:B2
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/",$token))
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token))
{
return $this->_convertRange3d($token);
}
@@ -1222,14 +1222,14 @@
return $token;
}
// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1)
- elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/",$token) and
+ elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token)
and
!ereg("[0-9]",$this->_lookahead) and
($this->_lookahead != ':') and ($this->_lookahead !=
'.'))
{
return $token;
}
// If it's an external reference ('Sheet1'!A1 or
'Sheet1:Sheet2'!A1)
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/",$token) and
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token) and
!ereg("[0-9]",$this->_lookahead) and
($this->_lookahead != ':') and ($this->_lookahead !=
'.'))
{
@@ -1248,13 +1248,13 @@
return $token;
}
// If it's an external range like Sheet1!A1 or Sheet1:Sheet2!A1:B2
- elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/",$token)
and
+ elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token)
and
!ereg("[0-9]",$this->_lookahead))
{
return $token;
}
// If it's an external range like 'Sheet1'!A1 or
'Sheet1:Sheet2'!A1:B2
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/",$token) and
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token) and
!ereg("[0-9]",$this->_lookahead))
{
return $token;
@@ -1489,14 +1489,14 @@
return $result;
}
// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1)
- elseif
(preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/",$this->_current_token))
+ elseif
(preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/u",$this->_current_token))
{
$result = $this->_createTree($this->_current_token, '', '');
$this->_advance();
return $result;
}
// If it's an external reference ('Sheet1'!A1 or
'Sheet1:Sheet2'!A1)
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/",$this->_current_token))
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/u",$this->_current_token))
{
$result = $this->_createTree($this->_current_token, '', '');
$this->_advance();
@@ -1511,14 +1511,14 @@
return $result;
}
// If it's an external range (Sheet1!A1 or Sheet1!A1:B2)
- elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/",$this->_current_token))
+ elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$this->_current_token))
{
$result = $this->_current_token;
$this->_advance();
return $result;
}
// If it's an external range ('Sheet1'!A1 or 'Sheet1'!A1:B2)
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/",$this->_current_token))
+ elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$this->_current_token))
{
$result = $this->_current_token;
$this->_advance();