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

Bugfix: (tavoarcila) Work Item GH-259 - Bug fix reading Open Office files

This commit is contained in:
Mark Baker 2013-10-30 13:50:40 +00:00
parent f86458630f
commit 6fd27196f0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/PHPExcel/Reader/OOCalc.php
View File

@ -572,7 +572,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
$type = PHPExcel_Cell_DataType::TYPE_NUMERIC; $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
$dataValue = (float) $cellDataOfficeAttributes['value']; $dataValue = (float) $cellDataOfficeAttributes['value'];
if (floor($dataValue) == $dataValue) { if (floor($dataValue) == $dataValue) {
if ($dataValue = (integer) $dataValue) if ($dataValue == (integer) $dataValue)
$dataValue = (integer) $dataValue; $dataValue = (integer) $dataValue;
else else
$dataValue = (float) $dataValue; $dataValue = (float) $dataValue;

26
changelog.txt
View File

@ -24,19 +24,19 @@
Fixed in develop branch for release v1.8.0: Fixed in develop branch for release v1.8.0:
- Bugfix: (MBaker) Work item 19830 - Undefined variable: fileHandle in CSV Reader - Bugfix: (MBaker) Work item 19830 - Undefined variable: fileHandle in CSV Reader
- Bugfix: (MBaker) Work item 19968 - Out of memory in style/supervisor.php - Bugfix: (MBaker) Work item 19968 - Out of memory in style/supervisor.php
- Bugfix: (MBaker) - Style error with merged cells in PDF Writer - Bugfix: (MBaker) - Style error with merged cells in PDF Writer
- Bugfix: (MBaker) - Problem with cloning worksheets - Bugfix: (MBaker) - Problem with cloning worksheets
- Feature: (amerov) - Implementation of the Excel HLOOKUP() function - Bugfix: (tavoarcila) Work Item GH-259 - Bug fix reading Open Office files
- Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) - Feature: (amerov) - Implementation of the Excel HLOOKUP() function
- Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer - Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only)
- General: (cdhutch) Work item 20055 - Remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed - Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer
- General: (MBaker) - Improve stock chart handling and rendering, with help from Swashata Ghosh - General: (cdhutch) Work item 20055 - Remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed
- General: (MBaker) - Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load - General: (MBaker) - Improve stock chart handling and rendering, with help from Swashata Ghosh
if it's actually required - General: (MBaker) - Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load if it's actually required
- General: (MBaker) - Modified Excel2007 Writer to default preCalculateFormulas to false - General: (MBaker) - Modified Excel2007 Writer to default preCalculateFormulas to false
Note that autosize columns will still recalculate affected formulae internally Note that autosize columns will still recalculate affected formulae internally
Fixed in develop branch for release v1.7.9: Fixed in develop branch for release v1.7.9: