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

Initial work on ODS reader to support array formulae

Browse Source
This commit is contained in:
MarkBaker
2022-02-25 21:17:18 +01:00
parent a67cffc7d2
commit 200713a9b7
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Reader/Ods.php
+25 -2
View File
@@ -218,7 +218,7 @@ class Ods extends BaseReader
/**
* Loads PhpSpreadsheet from file.
*/
protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
public function loadSpreadsheetFromFile(string $filename): Spreadsheet
{
// Create new Spreadsheet
$spreadsheet = new Spreadsheet();
@@ -374,9 +374,12 @@ class Ods extends BaseReader
$hasCalculatedValue = false;
$cellDataFormula = '';
$arrayAttributeRows = $arrayAttributeColumns = null;
if ($cellData->hasAttributeNS($tableNs, 'formula')) {
$cellDataFormula = $cellData->getAttributeNS($tableNs, 'formula');
$hasCalculatedValue = true;
$arrayAttributeRows = $cellData->getAttributeNS($tableNs, 'number-matrix-rows-spanned');
$arrayAttributeColumns = $cellData->getAttributeNS($tableNs, 'number-matrix-columns-spanned');
}
// Annotations
@@ -524,10 +527,14 @@ class Ods extends BaseReader
$dataValue = null;
}
$isArrayFormula = false;
$arrayFormulaRange = null;
if ($hasCalculatedValue) {
$type = DataType::TYPE_FORMULA;
$cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
$cellDataFormula = $this->convertToExcelFormulaValue($cellDataFormula);
$isArrayFormula = (!empty($arrayAttributeRows) && !empty($arrayAttributeColumns));
$arrayFormulaRange = null;
}
if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
@@ -551,7 +558,22 @@ class Ods extends BaseReader
// Set value
if ($hasCalculatedValue) {
$cell->setValueExplicit($cellDataFormula, $type);
$arrayFormulaRange = null;
if ($isArrayFormula === true) {
$arrayFormulaRange = $columnID . $rID;
$arrayAttributeRows = (int) $arrayAttributeRows;
$arrayAttributeColumns = (int) $arrayAttributeColumns;
if ($arrayAttributeRows > 1 || $arrayAttributeColumns > 1) {
$arrayFormulaRange .= ':' .
Coordinate::stringFromColumnIndex(
Coordinate::columnIndexFromString($columnID)
+ $arrayAttributeColumns - 1
) .
(string) ($rID + $arrayAttributeRows - 1);
}
}
$cell->setValueExplicit($cellDataFormula, $type, $isArrayFormula, $arrayFormulaRange);
} else {
$cell->setValueExplicit($dataValue, $type);
}
@@ -769,6 +791,7 @@ class Ods extends BaseReader
$value = str_replace('$$', '', $value ?? '');
$value = Calculation::translateSeparator(';', ',', $value, $inBraces);
$value = preg_replace('/COM\.MICROSOFT\./ui', '_xlfn.', $value);
}
}
src/PhpSpreadsheet/Reader/Ods/BaseReader.php
+1
View File
@@ -66,6 +66,7 @@ abstract class BaseReader
$value = str_replace('$$', '', $value ?? '');
$value = Calculation::translateSeparator(';', ',', $value, $inBraces);
$value = preg_replace('/COM\.MICROSOFT\./ui', '', $value);
}
}