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

AddedFeature: Work item 8769 - Implement Gnumeric File Format 

Added ReadFilter and Merged Cell handling to Gnumeric Reader


git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60298 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2010-09-02 21:41:41 +00:00
parent f897a2d808
commit b0c5c19ed3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Classes/PHPExcel/Reader/Gnumeric.php
View File

@ -356,6 +356,14 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
$cellAttributes = $cell->attributes(); $cellAttributes = $cell->attributes();
$row = (string) $cellAttributes->Row + 1; $row = (string) $cellAttributes->Row + 1;
$column = PHPExcel_Cell::stringFromColumnIndex($cellAttributes->Col); $column = PHPExcel_Cell::stringFromColumnIndex($cellAttributes->Col);
// Read cell?
if (!is_null($this->getReadFilter())) {
if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
continue;
}
}
$ValueType = $cellAttributes->ValueType; $ValueType = $cellAttributes->ValueType;
$ExprID = (string) $cellAttributes->ExprID; $ExprID = (string) $cellAttributes->ExprID;
// echo 'Cell ',$column,$row,'<br />'; // echo 'Cell ',$column,$row,'<br />';
@ -398,6 +406,11 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type); $objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
} }
if (isset($sheet->MergedRegions)) {
foreach($sheet->MergedRegions->Merge as $mergeCells) {
$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
}
}
$worksheetID++; $worksheetID++;
} }