From c553df1efcddec6275766f22e12e9bbdd155168d Mon Sep 17 00:00:00 2001 From: Ivan Stanojevic Date: Mon, 22 Feb 2021 10:36:41 +0100 Subject: [PATCH 1/3] Update ReferenceHelper.php --- src/PhpSpreadsheet/ReferenceHelper.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index 13f7cf71b9..7c1c030999 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -608,7 +608,12 @@ public function insertNewBefore($pBefore, $pNumCols, $pNumRows, Worksheet $pShee // Update workbook: define names if (count($pSheet->getParent()->getDefinedNames()) > 0) { foreach ($pSheet->getParent()->getDefinedNames() as $definedName) { - if ($definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) { + $hash = null; + if ($definedName->getWorksheet()) { + $hash = $definedName->getWorksheet()->getHashCode(); + } + + if ($hash === $pSheet->getHashCode()) { $definedName->setValue($this->updateCellReference($definedName->getValue(), $pBefore, $pNumCols, $pNumRows)); } } From 326650dc3a7048b10e249c65b9d7fc749f63de59 Mon Sep 17 00:00:00 2001 From: Ivan Stanojevic Date: Mon, 1 Mar 2021 09:03:46 +0100 Subject: [PATCH 2/3] Update ReferenceHelper.php --- src/PhpSpreadsheet/ReferenceHelper.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index 7c1c030999..24f04a951f 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -608,12 +608,7 @@ public function insertNewBefore($pBefore, $pNumCols, $pNumRows, Worksheet $pShee // Update workbook: define names if (count($pSheet->getParent()->getDefinedNames()) > 0) { foreach ($pSheet->getParent()->getDefinedNames() as $definedName) { - $hash = null; - if ($definedName->getWorksheet()) { - $hash = $definedName->getWorksheet()->getHashCode(); - } - - if ($hash === $pSheet->getHashCode()) { + if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) { $definedName->setValue($this->updateCellReference($definedName->getValue(), $pBefore, $pNumCols, $pNumRows)); } } From a84a23671c1c1bc101b37f8e4b432f435f134942 Mon Sep 17 00:00:00 2001 From: Ivan Stanojevic Date: Mon, 1 Mar 2021 09:07:12 +0100 Subject: [PATCH 3/3] Update ReferenceHelper.php --- src/PhpSpreadsheet/ReferenceHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index 24f04a951f..513f0a534c 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -608,7 +608,7 @@ public function insertNewBefore($pBefore, $pNumCols, $pNumRows, Worksheet $pShee // Update workbook: define names if (count($pSheet->getParent()->getDefinedNames()) > 0) { foreach ($pSheet->getParent()->getDefinedNames() as $definedName) { - if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) { + if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) { $definedName->setValue($this->updateCellReference($definedName->getValue(), $pBefore, $pNumCols, $pNumRows)); } }