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

Merge pull request #1445 from FCG-Group/writer_fixes_valign_watermark 

writer / word2007 / support valign and watermark without paragraph
This commit is contained in:
troosan 2018-10-03 23:28:05 +02:00 committed by GitHub
parent 8a20678a7a 677e3f6a19
commit 18760620b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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');
$styleWriter = new ImageStyleWriter($xmlWriter, $style);
$xmlWriter->startElement('w:p');
if (!$this->withoutP) {
$xmlWriter->startElement('w:p');
}
$xmlWriter->startElement('w:r');
$xmlWriter->startElement('w:pict');
$xmlWriter->startElement('v:shape');
@ -118,6 +120,8 @@ class Image extends AbstractElement
$xmlWriter->endElement(); // v:shape
$xmlWriter->endElement(); // w:pict
$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',
'vPos' => 'mso-position-vertical',
'hPosRelTo' => 'mso-position-horizontal-relative',
'vPosRelTo' => 'mso-position-vertical-relative',
);
$posStyles = $this->getStyles($style, $properties);