From 1272224164ad9f00bed818d2eb5df8224836160b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Wed, 3 Mar 2021 19:12:06 +0100
Subject: [PATCH] Minor Refactoring

---
 src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
index 30aa45a3..4c0929db 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -69,7 +69,10 @@ class DefinedNames
         $this->objWriter->startElement('definedName');
         $this->objWriter->writeAttribute('name', $pDefinedName->getName());
         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);
@@ -207,16 +210,11 @@ class DefinedNames
             } else {
                 $worksheet = str_replace("''", "'", trim($worksheet, "'"));
             }
+
             if (!empty($worksheet)) {
                 $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
             }
-
-            if (!empty($column)) {
-                $newRange .= $column;
-            }
-            if (!empty($row)) {
-                $newRange .= $row;
-            }
+            $newRange = "{$newRange}{$column}{$row}";
 
             $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
         }