Skip to content

Commit 721c582

Browse files
committed
Small fixes for the last commit
1 parent 61c6d51 commit 721c582

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/PhpWord/Reader/ODText/AbstractPart.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,16 @@ protected function readFontStyle(XMLReader $xmlReader, \DOMElement $domNode)
8484
protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode)
8585
{
8686
}
87+
88+
/**
89+
* Read style definition (override)
90+
*
91+
* @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
92+
* @param \DOMElement $parentNode
93+
* @param array $styleDefs
94+
* @return array
95+
*/
96+
protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array())
97+
{
98+
}
8799
}

src/PhpWord/Reader/Word2007/AbstractPart.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode)
391391
$style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle');
392392
} else {
393393
$styleNode = $xmlReader->getElement('w:tblPr', $domNode);
394+
$styleDefs = array();
394395
// $styleDefs['styleName'] = array(self::READ_VALUE, 'w:tblStyle');
395396
foreach ($margins as $side) {
396397
$ucfSide = ucfirst($side);
@@ -432,11 +433,11 @@ private function readCellStyle(XMLReader $xmlReader, \DOMElement $domNode)
432433
* Read style definition
433434
*
434435
* @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
435-
* @param \DOMElement $domNode
436+
* @param \DOMElement $parentNode
436437
* @param array $styleDefs
437438
* @return array
438439
*/
439-
protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode, $styleDefs)
440+
protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array())
440441
{
441442
$styles = array();
442443

0 commit comments

Comments
 (0)