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

merge

This commit is contained in:
jhfangying 2014-03-13 16:01:48 +08:00
parent b79a66ba9e
commit a6e91ef195
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Classes/PHPWord/Writer/Word2007/Base.php
View File

@ -126,14 +126,11 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart {
* @return void * @return void
*/ */
protected function _writeParagraphStyle( protected function _writeParagraphStyle(
<<<<<<< HEAD
PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Style_Paragraph $style, $withoutPPR = false) {
=======
PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Shared_XMLWriter $objWriter = null,
PHPWord_Style_Paragraph $style, PHPWord_Style_Paragraph $style,
$withoutPPR = false $withoutPPR = false
) { ) {
>>>>>>> 5e0fc7a2d815c96de6f6cdd081404df61e8ed886
$align = $style->getAlign(); $align = $style->getAlign();
$spacing = $style->getSpacing(); $spacing = $style->getSpacing();
$spaceBefore = $style->getSpaceBefore(); $spaceBefore = $style->getSpaceBefore();
@ -932,8 +929,4 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart {
$objWriter->endElement(); // w:p $objWriter->endElement(); // w:p
} }
} }
<<<<<<< HEAD
=======
>>>>>>> 5e0fc7a2d815c96de6f6cdd081404df61e8ed886
} }