diff --git a/Classes/PHPExcel/Reader/OOCalc.php b/Classes/PHPExcel/Reader/OOCalc.php index aa296098..8343e377 100644 --- a/Classes/PHPExcel/Reader/OOCalc.php +++ b/Classes/PHPExcel/Reader/OOCalc.php @@ -572,7 +572,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce $type = PHPExcel_Cell_DataType::TYPE_NUMERIC; $dataValue = (float) $cellDataOfficeAttributes['value']; if (floor($dataValue) == $dataValue) { - if ($dataValue = (integer) $dataValue) + if ($dataValue == (integer) $dataValue) $dataValue = (integer) $dataValue; else $dataValue = (float) $dataValue; diff --git a/changelog.txt b/changelog.txt index 3eca4dc1..ca6a42e0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -24,19 +24,19 @@ Fixed in develop branch for release v1.8.0: -- 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) - Style error with merged cells in PDF Writer -- Bugfix: (MBaker) - Problem with cloning worksheets -- Feature: (amerov) - Implementation of the Excel HLOOKUP() function -- Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) -- Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer -- General: (cdhutch) Work item 20055 - Remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed -- General: (MBaker) - Improve stock chart handling and rendering, with help from Swashata Ghosh -- 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 - Note that autosize columns will still recalculate affected formulae internally +- 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) - Style error with merged cells in PDF Writer +- Bugfix: (MBaker) - Problem with cloning worksheets +- Bugfix: (tavoarcila) Work Item GH-259 - Bug fix reading Open Office files +- Feature: (amerov) - Implementation of the Excel HLOOKUP() function +- Feature: (MBaker) - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) +- Feature: (MBaker) - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer +- General: (cdhutch) Work item 20055 - Remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed +- General: (MBaker) - Improve stock chart handling and rendering, with help from Swashata Ghosh +- 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 + Note that autosize columns will still recalculate affected formulae internally Fixed in develop branch for release v1.7.9: