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

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

@ -96,21 +96,7 @@ class CellValueFormatter
$pNodes = $node->getElementsByTagName(self::XML_NODE_P); $pNodes = $node->getElementsByTagName(self::XML_NODE_P);
foreach ($pNodes as $pNode) { foreach ($pNodes as $pNode) {
$currentPValue = ''; $pNodeValues[] = $this->extractTextFromNode($pNode);
foreach ($pNode->childNodes as $childNode) {
if ($childNode instanceof \DOMText) {
$currentPValue .= $childNode->nodeValue;
} elseif ($childNode->nodeName === self::XML_NODE_S) {
$spaceAttribute = $childNode->getAttribute(self::XML_ATTRIBUTE_C);
$numSpaces = (!empty($spaceAttribute)) ? (int) $spaceAttribute : 1;
$currentPValue .= str_repeat(' ', $numSpaces);
} elseif ($childNode->nodeName === self::XML_NODE_A || $childNode->nodeName === self::XML_NODE_SPAN) {
$currentPValue .= $childNode->nodeValue;
}
}
$pNodeValues[] = $currentPValue;
} }
$escapedCellValue = implode("\n", $pNodeValues); $escapedCellValue = implode("\n", $pNodeValues);
@ -119,6 +105,29 @@ class CellValueFormatter
return $cellValue; return $cellValue;
} }
/**
* @param \DOMNode $pNode
* @return string
*/
protected function extractTextFromNode($pNode)
{
$currentPValue = '';
foreach ($pNode->childNodes as $childNode) {
if ($childNode instanceof \DOMText) {
$currentPValue .= $childNode->nodeValue;
} elseif ($childNode->nodeName === self::XML_NODE_S) {
$spaceAttribute = $childNode->getAttribute(self::XML_ATTRIBUTE_C);
$numSpaces = (!empty($spaceAttribute)) ? (int) $spaceAttribute : 1;
$currentPValue .= str_repeat(' ', $numSpaces);
} elseif ($childNode->nodeName === self::XML_NODE_A || $childNode->nodeName === self::XML_NODE_SPAN) {
$currentPValue .= $this->extractTextFromNode($childNode);
}
}
return $currentPValue;
}
/** /**
* Returns the cell Numeric value from the given node. * Returns the cell Numeric value from the given node.
* *