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

Add `writeRaw` annotation and disambiguate `Settings`

This commit is contained in:
Ivan Lanin 2014-05-16 01:22:34 +07:00
parent 5511378eca
commit f380c29eef
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PhpWord/Shared/XMLWriter.php
View File

@ -28,12 +28,13 @@ if (!defined('DATE_W3C')) {
/** /**
* XMLWriter wrapper * XMLWriter wrapper
* *
* @method bool writeElement(string $name, string $content = null)
* @method bool startElement(string $name)
* @method bool writeAttribute(string $name, string $value)
* @method bool endElement() * @method bool endElement()
* @method bool startDocument(string $version = 1.0, string $encoding = null, string $standalone = null) * @method bool startDocument(string $version = 1.0, string $encoding = null, string $standalone = null)
* @method bool startElement(string $name)
* @method bool text(string $content) * @method bool text(string $content)
* @method bool writeAttribute(string $name, string $value)
* @method bool writeElement(string $name, string $content = null)
* @method bool writeRaw(string $content)
*/ */
class XMLWriter class XMLWriter
{ {

6
src/PhpWord/Writer/Word2007/Part/Styles.php
View File

@ -17,7 +17,7 @@
namespace PhpOffice\PhpWord\Writer\Word2007\Part; namespace PhpOffice\PhpWord\Writer\Word2007\Part;
use PhpOffice\PhpWord\Settings; use PhpOffice\PhpWord\Settings as PhpWordSettings;
use PhpOffice\PhpWord\Shared\XMLWriter; use PhpOffice\PhpWord\Shared\XMLWriter;
use PhpOffice\PhpWord\Style; use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Style\Font; use PhpOffice\PhpWord\Style\Font;
@ -158,8 +158,8 @@ class Styles extends AbstractPart
*/ */
private function writeDefaultStyles(XMLWriter $xmlWriter, $styles) private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
{ {
$fontName = Settings::getDefaultFontName(); $fontName = PhpWordSettings::getDefaultFontName();
$fontSize = Settings::getDefaultFontSize(); $fontSize = PhpWordSettings::getDefaultFontSize();
// Default font // Default font
$xmlWriter->startElement('w:docDefaults'); $xmlWriter->startElement('w:docDefaults');