mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-13 11:36:24 +00:00
Merge pull request #4912 from oleibman/issue434
Tighten Up Writer Html Logic
This commit is contained in:
@@ -1595,7 +1595,13 @@ class Html extends BaseWriter
|
||||
$origData2 = $cell->getValueString();
|
||||
}
|
||||
}
|
||||
$formatCode = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
|
||||
$style = $worksheet->getParent()
|
||||
?->getCellXfByIndexOrNull(
|
||||
$cell->getXfIndex()
|
||||
);
|
||||
$formatCode = $style
|
||||
?->getNumberFormat()
|
||||
->getFormatCode();
|
||||
|
||||
$cellData = NumberFormat::toFormattedString(
|
||||
$origData2,
|
||||
@@ -1606,9 +1612,9 @@ class Html extends BaseWriter
|
||||
if ($cellData === $origData) {
|
||||
$cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
|
||||
}
|
||||
if ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
|
||||
if (true === $style?->getFont()->getSuperscript()) {
|
||||
$cellData = '<sup>' . $cellData . '</sup>';
|
||||
} elseif ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
|
||||
} elseif (true === $style?->getFont()->getSubscript()) {
|
||||
$cellData = '<sub>' . $cellData . '</sub>';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user