Skip to content

Commit

Permalink
Fix warning when reading xlsx without styles
Browse files Browse the repository at this point in the history
  • Loading branch information
AegirLeet authored and PowerKiKi committed Aug 19, 2018
1 parent 62f4b7c commit bebfb1e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Allow iterators to go out of bounds with prev - [#587](https://github.com/PHPOffice/PhpSpreadsheet/issues/587)
- Fix warning when reading xlsx without styles - [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)

## [1.4.0] - 2018-08-06

Expand Down
2 changes: 1 addition & 1 deletion src/PhpSpreadsheet/Reader/Xlsx.php
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ public function load($pFilename)
$excel->addCellXf($objStyle);
}

foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
foreach (isset($xmlStyles->cellStyleXfs->xf) ? $xmlStyles->cellStyleXfs->xf : [] as $xf) {
$numFmt = NumberFormat::FORMAT_GENERAL;
if ($numFmts && $xf['numFmtId']) {
$tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
Expand Down

0 comments on commit bebfb1e

Please sign in to comment.