Rowspans/colspans were incorrect when adding worksheet using loadInto…

…Existing 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 PHPOffice#619 Fixes PHPOffice#620
Dfred · Oct 29, 2018 · f8bf7c6 · f8bf7c6
1 parent f570580
commit f8bf7c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Chained operations on cell ranges involving borders operated on last cell only [#428](https://github.com/PHPOffice/PhpSpreadsheet/issues/428)
 - Avoid memory exhaustion when cloning worksheet with a drawing [#437](https://github.com/PHPOffice/PhpSpreadsheet/issues/437)
 - Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
+- Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
 
 ## [1.3.1] - 2018-06-12
 

diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
@@ -554,6 +554,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
         $row = 0;
         $column = 'A';
         $content = '';
+        $this->rowspan = [];
         $this->processDomElement($dom, $spreadsheet->getActiveSheet(), $row, $column, $content);
 
         // Return