From 721c5825a6c7e6257ef13309ead067a4df4396f8 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Wed, 21 May 2014 00:26:43 +0700 Subject: [PATCH] Small fixes for the last commit --- src/PhpWord/Reader/ODText/AbstractPart.php | 12 ++++++++++++ src/PhpWord/Reader/Word2007/AbstractPart.php | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php index e96e927f..815e60fd 100644 --- a/src/PhpWord/Reader/ODText/AbstractPart.php +++ b/src/PhpWord/Reader/ODText/AbstractPart.php @@ -84,4 +84,16 @@ abstract class AbstractPart extends Word2007AbstractPart protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode) { } + + /** + * Read style definition (override) + * + * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader + * @param \DOMElement $parentNode + * @param array $styleDefs + * @return array + */ + protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array()) + { + } } diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php index 25cd7bf6..9a0e0c63 100644 --- a/src/PhpWord/Reader/Word2007/AbstractPart.php +++ b/src/PhpWord/Reader/Word2007/AbstractPart.php @@ -391,6 +391,7 @@ abstract class AbstractPart $style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle'); } else { $styleNode = $xmlReader->getElement('w:tblPr', $domNode); + $styleDefs = array(); // $styleDefs['styleName'] = array(self::READ_VALUE, 'w:tblStyle'); foreach ($margins as $side) { $ucfSide = ucfirst($side); @@ -432,11 +433,11 @@ abstract class AbstractPart * Read style definition * * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader - * @param \DOMElement $domNode + * @param \DOMElement $parentNode * @param array $styleDefs * @return array */ - protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode, $styleDefs) + protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array()) { $styles = array();