Merge pull request #1445 from FCG-Group/writer_fixes_valign_watermark

writer / word2007 / support valign and watermark without paragraph

Author: troosan

src/PhpWord/Writer/Word2007/Element/Image.php

@@ -103,7 +103,9 @@ private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
         $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 @@ private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
         $xmlWriter->endElement(); // v:shape
         $xmlWriter->endElement(); // w:pict
         $xmlWriter->endElement(); // w:r
-        $xmlWriter->endElement(); // w:p
+        if (!$this->withoutP) {
+            $xmlWriter->endElement(); // w:p
+        }
     }
 }

src/PhpWord/Writer/Word2007/Style/Frame.php

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