alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Workitem 14374 - BUG : Excel5 and setReadFilter ? 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@61896 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2010-10-05 22:20:49 +00:00
parent 678b40bb24
commit 2ec5a8b3bb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Classes/PHPExcel/Reader/Excel5.php
View File

@ -828,11 +828,14 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
// treat SHAREDFMLA records // treat SHAREDFMLA records
if ($this->_version == self::XLS_BIFF8) { if ($this->_version == self::XLS_BIFF8) {
foreach ($this->_sharedFormulaParts as $cell => $baseCell) { foreach ($this->_sharedFormulaParts as $cell => $baseCell) {
list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
$formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell); $formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell);
$this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA); $this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
} }
} }
} }
}
// add the named ranges (defined names) // add the named ranges (defined names)
foreach ($this->_definedname as $definedName) { foreach ($this->_definedname as $definedName) {

1
changelog.txt
View File

@ -49,6 +49,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Added autoloader to DefaultValueBinder and AdvancedValueBinder - Bugfix: (MBaker) Added autoloader to DefaultValueBinder and AdvancedValueBinder
- Bugfix: (MBaker) Modified PHPExcel_Shared_Date::isDateTimeFormatCode() to return false if format code begins with "_" or with "0 " to prevent false positives - Bugfix: (MBaker) Modified PHPExcel_Shared_Date::isDateTimeFormatCode() to return false if format code begins with "_" or with "0 " to prevent false positives
These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats
- Bugfix: (MBaker) Workitem 14374 - BUG : Excel5 and setReadFilter ?
2010-08-26 (v1.7.4): 2010-08-26 (v1.7.4):