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

Revert "Fixed a bug in TextBox; addText to a TextBox was treated 'withoutP'. This is not the expected behaviour" 

This reverts commit ade740b562.
This commit is contained in:
Bas-Jan 't Jong 2014-05-08 21:41:30 +02:00
parent ade740b562
commit 841bc2ac69
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Writer/Word2007/Element/TextBox.php
View File

@ -57,7 +57,9 @@ class TextBox extends Element
$margins = implode(', ', $tbxStyle->getInnerMargin()); $margins = implode(', ', $tbxStyle->getInnerMargin());
$this->xmlWriter->writeAttribute('inset', $margins); $this->xmlWriter->writeAttribute('inset', $margins);
$this->xmlWriter->startElement('w:txbxContent'); $this->xmlWriter->startElement('w:txbxContent');
$this->xmlWriter->startElement('w:p');
$this->parentWriter->writeContainerElements($this->xmlWriter, $this->element); $this->parentWriter->writeContainerElements($this->xmlWriter, $this->element);
$this->xmlWriter->endElement(); // w:p
$this->xmlWriter->endElement(); // w:txbxContent $this->xmlWriter->endElement(); // w:txbxContent
$this->xmlWriter->endElement(); // v: textbox $this->xmlWriter->endElement(); // v: textbox
$styleWriter->writeW10Wrap(); $styleWriter->writeW10Wrap();

2
src/PhpWord/Writer/Word2007/Part/AbstractPart.php
View File

@ -110,7 +110,7 @@ abstract class AbstractPart
// Loop through elements // Loop through elements
$elements = $container->getElements(); $elements = $container->getElements();
$withoutP = in_array($containerName, array('TextRun', 'Footnote', 'Endnote')) ? true : false; $withoutP = in_array($containerName, array('TextRun', 'Footnote', 'Endnote', 'TextBox')) ? true : false;
if (count($elements) > 0) { if (count($elements) > 0) {
foreach ($elements as $element) { foreach ($elements as $element) {
if ($element instanceof AbstractElement) { if ($element instanceof AbstractElement) {