diff --git a/Classes/PHPExcel/Writer/Excel5/Parser.php b/Classes/PHPExcel/Writer/Excel5/Parser.php index 37a43d1..167f805 100644 --- a/Classes/PHPExcel/Writer/Excel5/Parser.php +++ b/Classes/PHPExcel/Writer/Excel5/Parser.php @@ -1149,8 +1149,11 @@ class PHPExcel_Writer_Excel5_Parser return $token; break; case "^": - return $token; - break; + return $token; + break; + case "&": + return $token; + break; default: // if it's a reference A1 or $A$1 or $A1 or A$1 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and @@ -1265,6 +1268,10 @@ class PHPExcel_Writer_Excel5_Parser $this->_advance(); $result2 = $this->_expression(); $result = $this->_createTree('ptgNE', $result, $result2); + } elseif ($this->_current_token == "&") { + $this->_advance(); + $result2 = $this->_expression(); + $result = $this->_createTree('ptgConcat', $result, $result2); } return $result; } diff --git a/changelog.txt b/changelog.txt index ace3c4f..c0cfc1b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -24,7 +24,7 @@ Fixed in SVN: - +- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Concatenation operator 2010-08-26 (v1.7.4): - Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Power