RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-29 08:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Workitem 7895 - Excel5 : Formula : Percent

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60223 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Progi1984 2010-09-01 12:10:59 +00:00
parent d37e89f613
commit ee74ef9254
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Classes/PHPExcel/Writer/Excel5/Parser.php
View File

@ -1179,6 +1179,9 @@ class PHPExcel_Writer_Excel5_Parser
case "&": case "&":
return $token; return $token;
break; break;
case "%":
return $token;
break;
default: default:
// if it's a reference A1 or $A$1 or $A1 or A$1 // 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 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and
@ -1476,11 +1479,16 @@ class PHPExcel_Writer_Excel5_Parser
$this->_advance(); $this->_advance();
return $result; return $result;
} }
// If it's a number or a percent
elseif (is_numeric($this->_current_token)) elseif (is_numeric($this->_current_token))
{ {
$result = $this->_createTree($this->_current_token, '', ''); if($this->_lookahead == '%'){
$this->_advance(); $result = $this->_createTree('ptgPercent', $this->_current_token, '');
return $result; } else {
$result = $this->_createTree($this->_current_token, '', '');
}
$this->_advance();
return $result;
} }
// if it's a function call // if it's a function call
elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token)) elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token))

3
changelog.txt
View File

@ -24,8 +24,11 @@
Fixed in SVN: Fixed in SVN:
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Percent
- Feature: (MBaker) Support for Extended Workbook Properties in Excel2007, Excel5 and OOCalc Readers; support for User-defined Workbook Properties in Excel2007 and OOCalc Readers - Feature: (MBaker) Support for Extended Workbook Properties in Excel2007, Excel5 and OOCalc Readers; support for User-defined Workbook Properties in Excel2007 and OOCalc Readers
- Bugfix: (MB) Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php - Bugfix: (MB) Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Error constant
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Concatenation operator
2010-08-26 (v1.7.4): 2010-08-26 (v1.7.4):
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Power - Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Power