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

Minor Refactoring

This commit is contained in:
MarkBaker 2021-03-03 19:12:06 +01:00
parent 60023e48f2
commit 1272224164
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,10 @@ class DefinedNames
$this->objWriter->startElement('definedName'); $this->objWriter->startElement('definedName');
$this->objWriter->writeAttribute('name', $pDefinedName->getName()); $this->objWriter->writeAttribute('name', $pDefinedName->getName());
if ($pDefinedName->getLocalOnly() && $pDefinedName->getScope() !== null) { if ($pDefinedName->getLocalOnly() && $pDefinedName->getScope() !== null) {
$this->objWriter->writeAttribute('localSheetId', $pDefinedName->getScope()->getParent()->getIndex($pDefinedName->getScope())); $this->objWriter->writeAttribute(
'localSheetId',
$pDefinedName->getScope()->getParent()->getIndex($pDefinedName->getScope())
);
} }
$definedRange = $this->getDefinedRange($pDefinedName); $definedRange = $this->getDefinedRange($pDefinedName);
@ -207,16 +210,11 @@ class DefinedNames
} else { } else {
$worksheet = str_replace("''", "'", trim($worksheet, "'")); $worksheet = str_replace("''", "'", trim($worksheet, "'"));
} }
if (!empty($worksheet)) { if (!empty($worksheet)) {
$newRange = "'" . str_replace("'", "''", $worksheet) . "'!"; $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
} }
$newRange = "{$newRange}{$column}{$row}";
if (!empty($column)) {
$newRange .= $column;
}
if (!empty($row)) {
$newRange .= $row;
}
$definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length); $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
} }