Skip to content

Commit 46eabba

Browse files
enableitPowerKiKi
authored andcommitted
Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting
Rowspans/colspans are now respected for each HTML document added to an existing spreadsheet as a new worksheet. The protected $rowspan class property should be emptied on each call to `loadIntoExisting`. Fixes #619 Fixes #620
1 parent adf95bc commit 46eabba

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
6767
- Chained operations on cell ranges involving borders operated on last cell only [#428](https://github.com/PHPOffice/PhpSpreadsheet/issues/428)
6868
- Avoid memory exhaustion when cloning worksheet with a drawing [#437](https://github.com/PHPOffice/PhpSpreadsheet/issues/437)
6969
- Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
70+
- Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
7071

7172
## [1.3.1] - 2018-06-12
7273

src/PhpSpreadsheet/Reader/Html.php

+1
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
554554
$row = 0;
555555
$column = 'A';
556556
$content = '';
557+
$this->rowspan = [];
557558
$this->processDomElement($dom, $spreadsheet->getActiveSheet(), $row, $column, $content);
558559

559560
// Return

0 commit comments

Comments
 (0)