Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Writers refactoring fixes

Browse Source
This commit is contained in:
Ivan Lanin 2014-05-10 14:45:51 +07:00
parent 0b13b22e07
commit 530f8ee357
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/PhpWord/Writer/HTML.php
View File

@ -17,7 +17,6 @@
namespace PhpOffice\PhpWord\Writer; namespace PhpOffice\PhpWord\Writer;
use PhpOffice\PhpWord\Element\AbstractElement;
use PhpOffice\PhpWord\Exception\Exception; use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\PhpWord; use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Style\Font; use PhpOffice\PhpWord\Style\Font;

5
src/PhpWord/Writer/HTML/Element/TextRun.php
View File

@ -17,11 +17,6 @@
namespace PhpOffice\PhpWord\Writer\HTML\Element; namespace PhpOffice\PhpWord\Writer\HTML\Element;
use PhpOffice\PhpWord\Element\Footnote as FootnoteElement;
use PhpOffice\PhpWord\Element\TextRun as TextRunElement;
use PhpOffice\PhpWord\Style\Paragraph;
use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph as ParagraphStyleWriter;
/** /**
* TextRun element HTML writer * TextRun element HTML writer
* *

6
src/PhpWord/Writer/HTML/Style/Generic.php
View File

@ -31,11 +31,11 @@ class Generic extends AbstractStyle
*/ */
public function write() public function write()
{ {
$this->style = $this->getStyle(); $style = $this->getStyle();
$css = array(); $css = array();
if (is_array($this->style) && !empty($this->style)) { if (is_array($style) && !empty($style)) {
$css = $this->style; $css = $style;
} }
return $this->assembleCss($css); return $this->assembleCss($css);

6
src/PhpWord/Writer/HTML/Style/Image.php
View File

@ -31,11 +31,11 @@ class Image extends AbstractStyle
*/ */
public function write() public function write()
{ {
$this->style = $this->getStyle(); $style = $this->getStyle();
$css = array(); $css = array();
$css['width'] = $this->getValueIf($this->style->getWidth(), $this->style->getWidth() . 'px'); $css['width'] = $this->getValueIf($style->getWidth(), $style->getWidth() . 'px');
$css['height'] = $this->getValueIf($this->style->getHeight(), $this->style->getHeight() . 'px'); $css['height'] = $this->getValueIf($style->getHeight(), $style->getHeight() . 'px');
return $this->assembleCss($css); return $this->assembleCss($css);
} }

1
src/PhpWord/Writer/RTF/Element/Text.php
View File

@ -19,7 +19,6 @@ namespace PhpOffice\PhpWord\Writer\RTF\Element;
use PhpOffice\PhpWord\Style; use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Style\Font as FontStyle; use PhpOffice\PhpWord\Style\Font as FontStyle;
use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
use PhpOffice\PhpWord\Writer\RTF\Style\Font as FontStyleWriter; use PhpOffice\PhpWord\Writer\RTF\Style\Font as FontStyleWriter;
use PhpOffice\PhpWord\Writer\RTF\Style\Paragraph as ParagraphStyleWriter; use PhpOffice\PhpWord\Writer\RTF\Style\Paragraph as ParagraphStyleWriter;

1
src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
View File

@ -17,7 +17,6 @@
namespace PhpOffice\PhpWord\Writer\Word2007\Style; namespace PhpOffice\PhpWord\Writer\Word2007\Style;
use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\Settings; use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Shared\XMLWriter; use PhpOffice\PhpWord\Shared\XMLWriter;

1
src/PhpWord/Writer/Word2007/Style/TextBox.php
View File

@ -17,7 +17,6 @@
namespace PhpOffice\PhpWord\Writer\Word2007\Style; namespace PhpOffice\PhpWord\Writer\Word2007\Style;
use PhpOffice\PhpWord\Shared\XMLWriter;
use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle; use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle;
/** /**