geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-08-31 12:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename xlfn functions for Ods

Browse Source
This commit is contained in:
MarkBaker
2022-02-26 12:10:46 +01:00
parent a83e3c6b2b
commit dc718ddfd6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Writer/Ods/Content.php
+5
View File
@@ -210,6 +210,11 @@ class Content extends WriterPart
// don't do anything
}
}
if ($cell->isArrayFormula()) {
[$columnSpan, $rowSpan] = Coordinate::rangeDimension((string) $cell->arrayFormulaRange());
$objWriter->writeAttribute('table:number-matrix-rows-spanned', $rowSpan);
$objWriter->writeAttribute('table:number-matrix-columns-spanned', $columnSpan);
}
$objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValue()));
if (is_numeric($formulaValue)) {
$objWriter->writeAttribute('office:value-type', 'float');
src/PhpSpreadsheet/Writer/Ods/Formula.php
+6
View File
@@ -23,6 +23,7 @@ class Formula
{
$formula = $this->convertCellReferences($formula, $worksheetName);
$formula = $this->convertDefinedNames($formula);
$formula = $this->convertFunctionNames($formula);
if (substr($formula, 0, 1) !== '=') {
$formula = '=' . $formula;
@@ -31,6 +32,11 @@ class Formula
return 'of:' . $formula;
}
private function convertFunctionNames(string $formula): string
{
return (string) preg_replace('/_xlfn\./ui', 'COM.MICROSOFT.', $formula);
}
private function convertDefinedNames(string $formula): string
{
$splitCount = preg_match_all(