Skip to content

Commit dc7cb1e

Browse files
committed
update changelog & doc
1 parent 253b060 commit dc7cb1e

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ This is the last version to support PHP 5.3
4242
- Padded the $args array to remove error - @kaigoh #1150, @reformed #870
4343
- Fix incorrect image size between windows and mac - @bskrtich #874
4444
- Fix adding HTML table to document - @mogilvie @arivanbastos #324
45+
- Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
4546

4647
### Deprecated
4748
- PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();

src/PhpWord/Element/Comment.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
/**
2121
* Comment element
22+
* @see http://datypic.com/sc/ooxml/t-w_CT_Comment.html
2223
*/
2324
class Comment extends TrackChange
2425
{

src/PhpWord/Element/TrackChange.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
/**
2121
* TrackChange element
22+
* @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
2223
*/
2324
class TrackChange extends AbstractContainer
2425
{

src/PhpWord/Reader/Word2007/AbstractPart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode)
384384
{
385385
$style = null;
386386
$margins = array('top', 'left', 'bottom', 'right');
387-
$borders = $margins + array('insideH', 'insideV');
387+
$borders = array_merge($margins, array('insideH', 'insideV'));
388388

389389
if ($xmlReader->elementExists('w:tblPr', $domNode)) {
390390
if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
@@ -422,7 +422,7 @@ private function readCellStyle(XMLReader $xmlReader, \DOMElement $domNode)
422422
'textDirection' => array(self::READ_VALUE, 'w:textDirection'),
423423
'gridSpan' => array(self::READ_VALUE, 'w:gridSpan'),
424424
'vMerge' => array(self::READ_VALUE, 'w:vMerge'),
425-
'bgColor' => array(self::READ_VALUE, 'w:shd/w:fill'),
425+
'bgColor' => array(self::READ_VALUE, 'w:shd', 'w:fill'),
426426
);
427427

428428
return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);

0 commit comments

Comments
 (0)