update changelog & doc
This commit is contained in:
parent
253b060241
commit
dc7cb1ee75
|
|
@ -42,6 +42,7 @@ This is the last version to support PHP 5.3
|
|||
- Padded the $args array to remove error - @kaigoh #1150, @reformed #870
|
||||
- Fix incorrect image size between windows and mac - @bskrtich #874
|
||||
- Fix adding HTML table to document - @mogilvie @arivanbastos #324
|
||||
- Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
|
||||
|
||||
### Deprecated
|
||||
- PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
|
|||
|
||||
/**
|
||||
* Comment element
|
||||
* @see http://datypic.com/sc/ooxml/t-w_CT_Comment.html
|
||||
*/
|
||||
class Comment extends TrackChange
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
|
|||
|
||||
/**
|
||||
* TrackChange element
|
||||
* @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
|
||||
*/
|
||||
class TrackChange extends AbstractContainer
|
||||
{
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ abstract class AbstractPart
|
|||
{
|
||||
$style = null;
|
||||
$margins = array('top', 'left', 'bottom', 'right');
|
||||
$borders = $margins + array('insideH', 'insideV');
|
||||
$borders = array_merge($margins, array('insideH', 'insideV'));
|
||||
|
||||
if ($xmlReader->elementExists('w:tblPr', $domNode)) {
|
||||
if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
|
||||
|
|
@ -422,7 +422,7 @@ abstract class AbstractPart
|
|||
'textDirection' => array(self::READ_VALUE, 'w:textDirection'),
|
||||
'gridSpan' => array(self::READ_VALUE, 'w:gridSpan'),
|
||||
'vMerge' => array(self::READ_VALUE, 'w:vMerge'),
|
||||
'bgColor' => array(self::READ_VALUE, 'w:shd/w:fill'),
|
||||
'bgColor' => array(self::READ_VALUE, 'w:shd', 'w:fill'),
|
||||
);
|
||||
|
||||
return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
|
||||
|
|
|
|||
Loading…
Reference in New Issue