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

writer / word2007 / support valign and watermark withouth paragraph

This commit is contained in:
Maxim Bulygin 2018-07-31 18:25:29 +03:00
parent 2bfd82e229
commit 677e3f6a19
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PhpWord/Writer/Word2007/Element/Image.php
View File

@ -103,7 +103,9 @@ class Image extends AbstractElement
$style->setPositioning('absolute'); $style->setPositioning('absolute');
$styleWriter = new ImageStyleWriter($xmlWriter, $style); $styleWriter = new ImageStyleWriter($xmlWriter, $style);
$xmlWriter->startElement('w:p'); if (!$this->withoutP) {
$xmlWriter->startElement('w:p');
}
$xmlWriter->startElement('w:r'); $xmlWriter->startElement('w:r');
$xmlWriter->startElement('w:pict'); $xmlWriter->startElement('w:pict');
$xmlWriter->startElement('v:shape'); $xmlWriter->startElement('v:shape');
@ -118,6 +120,8 @@ class Image extends AbstractElement
$xmlWriter->endElement(); // v:shape $xmlWriter->endElement(); // v:shape
$xmlWriter->endElement(); // w:pict $xmlWriter->endElement(); // w:pict
$xmlWriter->endElement(); // w:r $xmlWriter->endElement(); // w:r
$xmlWriter->endElement(); // w:p if (!$this->withoutP) {
$xmlWriter->endElement(); // w:p
}
} }
} }

1
src/PhpWord/Writer/Word2007/Style/Frame.php
View File

@ -61,6 +61,7 @@ class Frame extends AbstractStyle
'hPos' => 'mso-position-horizontal', 'hPos' => 'mso-position-horizontal',
'vPos' => 'mso-position-vertical', 'vPos' => 'mso-position-vertical',
'hPosRelTo' => 'mso-position-horizontal-relative', 'hPosRelTo' => 'mso-position-horizontal-relative',
'vPosRelTo' => 'mso-position-vertical-relative',
); );
$posStyles = $this->getStyles($style, $properties); $posStyles = $this->getStyles($style, $properties);