Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small fixes for the last commit

This commit is contained in:
Ivan Lanin 2014-05-21 00:26:43 +07:00
parent 61c6d51e5e
commit 721c5825a6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PhpWord/Reader/ODText/AbstractPart.php
View File

@ -84,4 +84,16 @@ abstract class AbstractPart extends Word2007AbstractPart
protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode) 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())
{
}
} }

5
src/PhpWord/Reader/Word2007/AbstractPart.php
View File

@ -391,6 +391,7 @@ abstract class AbstractPart
$style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle'); $style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle');
} else { } else {
$styleNode = $xmlReader->getElement('w:tblPr', $domNode); $styleNode = $xmlReader->getElement('w:tblPr', $domNode);
$styleDefs = array();
// $styleDefs['styleName'] = array(self::READ_VALUE, 'w:tblStyle'); // $styleDefs['styleName'] = array(self::READ_VALUE, 'w:tblStyle');
foreach ($margins as $side) { foreach ($margins as $side) {
$ucfSide = ucfirst($side); $ucfSide = ucfirst($side);
@ -432,11 +433,11 @@ abstract class AbstractPart
* Read style definition * Read style definition
* *
* @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
* @param \DOMElement $domNode * @param \DOMElement $parentNode
* @param array $styleDefs * @param array $styleDefs
* @return array * @return array
*/ */
protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode, $styleDefs) protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array())
{ {
$styles = array(); $styles = array();