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

Merge pull request #1637 from bhattnishant/master 

To support PreserveText inside sub container
This commit is contained in:
troosan 2019-08-08 07:08:13 +02:00 committed by GitHub
parent fa6a80fb4d d7ed18c39d
commit 487622bb9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Element/AbstractContainer.php
View File

@ -254,7 +254,7 @@ abstract class AbstractContainer extends AbstractElement
// Special condition, e.g. preservetext can only exists in cell when // Special condition, e.g. preservetext can only exists in cell when
// the cell is located in header or footer // the cell is located in header or footer
$validSubcontainers = array( $validSubcontainers = array(
'PreserveText' => array(array('Cell'), array('Header', 'Footer')), 'PreserveText' => array(array('Cell'), array('Header', 'Footer', 'Section')),
'Footnote' => array(array('Cell', 'TextRun'), array('Section')), 'Footnote' => array(array('Cell', 'TextRun'), array('Section')),
'Endnote' => array(array('Cell', 'TextRun'), array('Section')), 'Endnote' => array(array('Cell', 'TextRun'), array('Section')),
); );

2
tests/PhpWord/Element/CellTest.php
View File

@ -233,7 +233,7 @@ class CellTest extends AbstractWebServerEmbeddedTest
public function testAddPreserveTextException() public function testAddPreserveTextException()
{ {
$oCell = new Cell(); $oCell = new Cell();
$oCell->setDocPart('Section', 1); $oCell->setDocPart('TextRun', 1);
$oCell->addPreserveText('text'); $oCell->addPreserveText('text');
} }