Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Ivan Lanin 2014-03-12 15:03:06 +07:00
commit 042f7a06be
2 changed files with 13 additions and 0 deletions

View File

@ -131,6 +131,17 @@ class PHPWord_Section_TextRun
}
}
/**
* Add a Text Break
*
* @param int $count
*/
public function addTextBreak($count = 1) {
for ($i=1; $i<=$count; $i++) {
$this->_elementCollection[] = new PHPWord_Section_TextBreak();
}
}
/**
* Create a new Footnote Element
*

View File

@ -110,6 +110,8 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
$this->_writeImage($objWriter, $element, true);
} elseif ($element instanceof PHPWord_Section_Footnote) {
$this->_writeFootnoteReference($objWriter, $element, true);
} elseif ($element instanceof PHPWord_Section_TextBreak) {
$objWriter->writeElement('w:br');
}
}
}