mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding support for <text:s> inside <text:span> (fixes #666)

Browse Source
This commit is contained in:
Daniele De Nobili 2019-07-10 14:15:24 +02:00
parent 6c4086cf97
commit 24f81cc219
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Spout/Reader/ODS/Helper/CellValueFormatter.php
View File

@ -96,6 +96,21 @@ class CellValueFormatter
$pNodes = $node->getElementsByTagName(self::XML_NODE_P); $pNodes = $node->getElementsByTagName(self::XML_NODE_P);
foreach ($pNodes as $pNode) { foreach ($pNodes as $pNode) {
$pNodeValues[] = $this->extractTextFromNode($pNode);
}
$escapedCellValue = implode("\n", $pNodeValues);
$cellValue = $this->escaper->unescape($escapedCellValue);
return $cellValue;
}
/**
* @param \DOMNode $pNode
* @return string
*/
protected function extractTextFromNode($pNode)
{
$currentPValue = ''; $currentPValue = '';
foreach ($pNode->childNodes as $childNode) { foreach ($pNode->childNodes as $childNode) {
@ -106,17 +121,11 @@ class CellValueFormatter
$numSpaces = (!empty($spaceAttribute)) ? (int) $spaceAttribute : 1; $numSpaces = (!empty($spaceAttribute)) ? (int) $spaceAttribute : 1;
$currentPValue .= str_repeat(' ', $numSpaces); $currentPValue .= str_repeat(' ', $numSpaces);
} elseif ($childNode->nodeName === self::XML_NODE_A || $childNode->nodeName === self::XML_NODE_SPAN) { } elseif ($childNode->nodeName === self::XML_NODE_A || $childNode->nodeName === self::XML_NODE_SPAN) {
$currentPValue .= $childNode->nodeValue; $currentPValue .= $this->extractTextFromNode($childNode);
} }
} }
$pNodeValues[] = $currentPValue; return $currentPValue;
}
$escapedCellValue = implode("\n", $pNodeValues);
$cellValue = $this->escaper->unescape($escapedCellValue);
return $cellValue;
} }
/** /**