Skip to content

Commit 1253f35

Browse files
committed
Resolve Merge Conflict
1 parent b051d49 commit 1253f35

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/PhpSpreadsheet/Cell/Cell.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,10 @@ public function getCalculatedValue(bool $resetLog = true): mixed
385385

386386
if ($this->dataType === DataType::TYPE_FORMULA) {
387387
try {
388+
$index = $this->getWorksheet()->getParentOrThrow()->getActiveSheetIndex();
389+
$selected = $this->getWorksheet()->getSelectedCells();
388390
$thisworksheet = $this->getWorksheet();
389391
$title = $thisworksheet->getTitle();
390-
$index = $thisworksheet->getParentOrThrow()->getActiveSheetIndex();
391-
$selected = $thisworksheet->getSelectedCells();
392392
$result = Calculation::getInstance(
393393
$thisworksheet->getParent()
394394
)->calculateCellValue($this, $resetLog);

0 commit comments

Comments
 (0)