From f380c29eef254179d8543830c9b335b4647dac28 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Fri, 16 May 2014 01:22:34 +0700 Subject: [PATCH] Add `writeRaw` annotation and disambiguate `Settings` --- src/PhpWord/Shared/XMLWriter.php | 7 ++++--- src/PhpWord/Writer/Word2007/Part/Styles.php | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/PhpWord/Shared/XMLWriter.php b/src/PhpWord/Shared/XMLWriter.php index 3f029413..fdc6e29d 100644 --- a/src/PhpWord/Shared/XMLWriter.php +++ b/src/PhpWord/Shared/XMLWriter.php @@ -28,12 +28,13 @@ if (!defined('DATE_W3C')) { /** * 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 startDocument(string $version = 1.0, string $encoding = null, string $standalone = null) + * @method bool startElement(string $name) * @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 { diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php index 588c091c..961e9a55 100644 --- a/src/PhpWord/Writer/Word2007/Part/Styles.php +++ b/src/PhpWord/Writer/Word2007/Part/Styles.php @@ -17,7 +17,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part; -use PhpOffice\PhpWord\Settings; +use PhpOffice\PhpWord\Settings as PhpWordSettings; use PhpOffice\PhpWord\Shared\XMLWriter; use PhpOffice\PhpWord\Style; use PhpOffice\PhpWord\Style\Font; @@ -158,8 +158,8 @@ class Styles extends AbstractPart */ private function writeDefaultStyles(XMLWriter $xmlWriter, $styles) { - $fontName = Settings::getDefaultFontName(); - $fontSize = Settings::getDefaultFontSize(); + $fontName = PhpWordSettings::getDefaultFontName(); + $fontSize = PhpWordSettings::getDefaultFontSize(); // Default font $xmlWriter->startElement('w:docDefaults');