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

Fix documentation format and some type check

This commit is contained in:
Ivan Lanin 2014-04-11 18:16:24 +07:00
parent 297eeaadf0
commit 42167f8855
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/general.rst
View File

@ -63,9 +63,9 @@ XML Writer compatibility
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
This option sets This option sets
```XMLWriter::setIndent`` <http://www.php.net/manual/en/function.xmlwriter-set-indent.php>`__ `XMLWriter::setIndent <http://www.php.net/manual/en/function.xmlwriter-set-indent.php>`__
and and
```XMLWriter::setIndentString`` <http://www.php.net/manual/en/function.xmlwriter-set-indent-string.php>`__. `XMLWriter::setIndentString <http://www.php.net/manual/en/function.xmlwriter-set-indent-string.php>`__.
The default value of this option is ``true`` (compatible), which is The default value of this option is ``true`` (compatible), which is
`required for OpenOffice <https://github.com/PHPOffice/PHPWord/issues/103>`__ to `required for OpenOffice <https://github.com/PHPOffice/PHPWord/issues/103>`__ to
render OOXML document correctly. You can set this option to ``false`` render OOXML document correctly. You can set this option to ``false``

8
src/PhpWord/Reader/Word2007.php
View File

@ -224,7 +224,9 @@ class Word2007 extends AbstractReader implements ReaderInterface
if (!is_null($settingsNode)) { if (!is_null($settingsNode)) {
$settings = $this->readSectionStyle($xmlReader, $settingsNode); $settings = $this->readSectionStyle($xmlReader, $settingsNode);
$section->setSettings($settings); $section->setSettings($settings);
$this->readHeaderFooter($filename, $settings, $section); if (!is_null($settings)) {
$this->readHeaderFooter($filename, $settings, $section);
}
} }
$section = $this->phpWord->addSection(); $section = $this->phpWord->addSection();
} }
@ -237,7 +239,9 @@ class Word2007 extends AbstractReader implements ReaderInterface
case 'w:sectPr': // Last section case 'w:sectPr': // Last section
$settings = $this->readSectionStyle($xmlReader, $node); $settings = $this->readSectionStyle($xmlReader, $node);
$section->setSettings($settings); $section->setSettings($settings);
$this->readHeaderFooter($filename, $settings, $section); if (!is_null($settings)) {
$this->readHeaderFooter($filename, $settings, $section);
}
break; break;
} }
} }

2
src/PhpWord/Style/AbstractStyle.php
View File

@ -107,7 +107,7 @@ abstract class AbstractStyle
/** /**
* Set integer value * Set integer value
* *
* @param mixed $value * @param integer|null $value
* @param integer|null $default * @param integer|null $default
* @return integer|null * @return integer|null
*/ */

3
src/PhpWord/Style/ListItem.php
View File

@ -100,8 +100,6 @@ class ListItem extends AbstractStyle
/** /**
* Set numbering style name * Set numbering style name
*
* @param string $value
*/ */
public function setNumStyle($value) public function setNumStyle($value)
{ {
@ -126,7 +124,6 @@ class ListItem extends AbstractStyle
/** /**
* Get legacy numbering definition * Get legacy numbering definition
* *
* @param integer $listType
* @return array * @return array
* @since 0.9.2 * @since 0.9.2
*/ */