geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-20 15:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Baker
2021-03-03 18:16:37 +01:00
committed by GitHub
parent 70e371189c
commit 3e672710cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Writer/Xls/Workbook.php
+2 -2
View File
@@ -551,8 +551,8 @@ class Workbook extends BIFFwriter
$newRange = '';
if (empty($worksheet)) {
if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
// We need a worksheet
$worksheet = $pDefinedName->getWorksheet()->getTitle();
// We should have a worksheet
$worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
}
} else {
$worksheet = str_replace("''", "'", trim($worksheet, "'"));
src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
+1 -1
View File
@@ -99,7 +99,7 @@ class DefinedNames
if (empty($worksheet)) {
if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
// We should have a worksheet
$worksheet = $pDefinedName->getWorksheet()->getTitle();
$worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
}
} else {
$worksheet = str_replace("''", "'", trim($worksheet, "'"));