← All changes
|
libraries/vendor/PhpSpreadsheet/Reader/Xls/LoadSpreadsheet.php
+6
-8
3.3.2
→
3.4
View file →
| @@ -212,8 +212,9 @@ | ||
| 212 | 212 | // cells... during the load, all formulae should be correct, and we're simply bringing the worksheet |
| 213 | 213 | // name in line with the formula, not the reverse |
| 214 | 214 | $xls->phpSheet->setTitle($sheet['name'], false, false); |
| 215 | 215 | $xls->phpSheet->setSheetState($sheet['sheetState']); |
| 216 | + $xls->phpSheetTitle = $sheet['name']; | |
| 216 | 217 | |
| 217 | 218 | $xls->pos = $sheet['offset']; |
| 218 | 219 | |
| 219 | 220 | // Initialize isFitToPages. May change after reading SHEETPR record. |
| @@ -488,12 +489,10 @@ | ||
| 488 | 489 | continue; |
| 489 | 490 | } |
| 490 | 491 | |
| 491 | 492 | // calculate the width and height of the shape |
| 492 | - /** @var int $startRow */ | |
| 493 | - [$startColumn, $startRow] = Coordinate::coordinateFromString($spContainer->getStartCoordinates()); | |
| 494 | - /** @var int $endRow */ | |
| 495 | - [$endColumn, $endRow] = Coordinate::coordinateFromString($spContainer->getEndCoordinates()); | |
| 493 | + [, $startRow, $startColumn] = Coordinate::indexesFromString($spContainer->getStartCoordinates()); | |
| 494 | + [, $endRow, $endColumn] = Coordinate::indexesFromString($spContainer->getEndCoordinates()); | |
| 496 | 495 | |
| 497 | 496 | $startOffsetX = $spContainer->getStartOffsetX(); |
| 498 | 497 | $startOffsetY = $spContainer->getStartOffsetY(); |
| 499 | 498 | $endOffsetX = $spContainer->getEndOffsetX(); |
| @@ -514,9 +513,9 @@ | ||
| 514 | 513 | //$cellNote = $xls->cellNotes[$obj['idObjID']]; |
| 515 | 514 | |
| 516 | 515 | if (isset($xls->textObjects[$obj['idObjID']])) { |
| 517 | 516 | $textObject = $xls->textObjects[$obj['idObjID']]; |
| 518 | - $xls->cellNotes[$obj['idObjID']]['objTextData'] = $textObject; //* @phpstan-ignore-line | |
| 517 | + $xls->cellNotes[$obj['idObjID']]['objTextData'] = $textObject; //* @phpstan-ignore offsetAccess.nonOffsetAccessible (I don't know to fix this) | |
| 519 | 518 | } |
| 520 | 519 | } |
| 521 | 520 | |
| 522 | 521 | break; |
| @@ -585,12 +584,11 @@ | ||
| 585 | 584 | |
| 586 | 585 | // treat SHAREDFMLA records |
| 587 | 586 | if ($xls->version == self::XLS_BIFF8) { |
| 588 | 587 | foreach ($xls->sharedFormulaParts as $cell => $baseCell) { |
| 589 | - /** @var int $row */ | |
| 590 | - [$column, $row] = Coordinate::coordinateFromString($cell); | |
| 588 | + [, $row, $column] = Coordinate::indexesFromString($cell); | |
| 591 | 589 | /** @var string $baseCell */ |
| 592 | - if ($xls->getReadFilter()->readCell($column, $row, $xls->phpSheet->getTitle())) { | |
| 590 | + if ($xls->readFilter->readCell($column, $row, $xls->phpSheet->getTitle())) { | |
| 593 | 591 | /** @var string */ |
| 594 | 592 | $temp = $xls->sharedFormulas[$baseCell]; |
| 595 | 593 | $formula = $xls->getFormulaFromStructure($temp, $cell); |
| 596 | 594 | $xls->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA); |