Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Writing defined names without a worksheet reference in Xlsx (#1892)

This commit is contained in:
Mark Baker 2021-03-03 18:16:37 +01:00 committed by GitHub
parent 70e371189c
commit 3e672710cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpSpreadsheet/Writer/Xls/Workbook.php
View File

@ -551,8 +551,8 @@ class Workbook extends BIFFwriter
$newRange = ''; $newRange = '';
if (empty($worksheet)) { if (empty($worksheet)) {
if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) { if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
// We need a worksheet // We should have a worksheet
$worksheet = $pDefinedName->getWorksheet()->getTitle(); $worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
} }
} else { } else {
$worksheet = str_replace("''", "'", trim($worksheet, "'")); $worksheet = str_replace("''", "'", trim($worksheet, "'"));

2
src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
View File

@ -99,7 +99,7 @@ class DefinedNames
if (empty($worksheet)) { if (empty($worksheet)) {
if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) { if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
// We should have a worksheet // We should have a worksheet
$worksheet = $pDefinedName->getWorksheet()->getTitle(); $worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
} }
} else { } else {
$worksheet = str_replace("''", "'", trim($worksheet, "'")); $worksheet = str_replace("''", "'", trim($worksheet, "'"));