IMPROVED : Writer/ODText for just generating a simple file with some formatting texts and paragraphs

Author: Progi1984

src/PHPWord/Section/Text.php

@@ -65,32 +65,10 @@ class PHPWord_Section_Text {
 	 */
 	public function __construct($text = null, $styleFont = null, $styleParagraph = null) {
 		// Set font style
-		if(is_array($styleFont)) {
-			$this->_styleFont = new PHPWord_Style_Font('text');
-			
-			foreach($styleFont as $key => $value) {
-				if(substr($key, 0, 1) != '_') {
-					$key = '_'.$key;
-				}
-				$this->_styleFont->setStyleValue($key, $value);
-			}
-		} else {
-			$this->_styleFont = $styleFont;
-		}
+		$this->setFontStyle($styleFont);
 
 		// Set paragraph style
-		if(is_array($styleParagraph)) {
-			$this->_styleParagraph = new PHPWord_Style_Paragraph();
-			
-			foreach($styleParagraph as $key => $value) {
-				if(substr($key, 0, 1) != '_') {
-					$key = '_'.$key;
-				}
-				$this->_styleParagraph->setStyleValue($key, $value);
-			}
-		} else {
-			$this->_styleParagraph = $styleParagraph;
-		}
+		$this->setParagraphStyle($styleParagraph);
 
 		$this->_text = $text;
 
@@ -106,6 +84,26 @@ public function getFontStyle() {
 		return $this->_styleFont;
 	}
 
+	/**
+	 * Set Text style
+	 *
+	 * @return PHPWord_Style_Font
+	 */
+	public function setFontStyle($styleFont) {
+		if(is_array($styleFont)) {
+			$this->_styleFont = new PHPWord_Style_Font('text');
+			
+			foreach($styleFont as $key => $value) {
+				if(substr($key, 0, 1) != '_') {
+					$key = '_'.$key;
+				}
+				$this->_styleFont->setStyleValue($key, $value);
+			}
+		} else {
+			$this->_styleFont = $styleFont;
+		}
+	}
+	
 	/**
 	 * Get Paragraph style
 	 * 
@@ -115,6 +113,26 @@ public function getParagraphStyle() {
 		return $this->_styleParagraph;
 	}
 
+	/**
+	 * Set Paragraph style
+	 *
+	 * @return PHPWord_Style_Paragraph
+	 */
+	public function setParagraphStyle($styleParagraph) {
+		if(is_array($styleParagraph)) {
+			$this->_styleParagraph = new PHPWord_Style_Paragraph();
+			
+			foreach($styleParagraph as $key => $value) {
+				if(substr($key, 0, 1) != '_') {
+					$key = '_'.$key;
+				}
+				$this->_styleParagraph->setStyleValue($key, $value);
+			}
+		} else {
+			$this->_styleParagraph = $styleParagraph;
+		}
+	}
+	
 	/**
 	 * Get Text content
 	 * 

src/PHPWord/Shared/Drawing.php

@@ -99,4 +99,28 @@ public static function angleToDegrees($pValue = 0) {
 			return 0;
 		}
 	}
+
+	/**
+	 * Convert pixels to centimeters
+	 *
+	 * @param 	int $pValue	Value in pixels
+	 * @return 	int			Value in centimeters
+	 */
+	public static function pixelsToCentimeters($pValue = 0) {
+		return $pValue * 0.028;
+	}
+	
+	/**
+	 * Convert centimeters width to pixels
+	 *
+	 * @param 	int $pValue	Value in centimeters
+	 * @return 	int			Value in pixels
+	 */
+	public static function centimetersToPixels($pValue = 0) {
+		if ($pValue != 0) {
+			return $pValue * 0.028;
+		} else {
+			return 0;
+		}
+	}
 }

src/PHPWord/Writer/ODText.php

@@ -32,7 +32,7 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
 	*
 	* @var PHPWord
 	*/
-	private $_presentation;
+	private $_document;
 
 	/**
 	* Private writer parts
@@ -80,6 +80,7 @@ public function __construct(PHPWord $pPHPWord = null)
 		$this->_writerParts['manifest'] = new PHPWord_Writer_ODText_Manifest();
 		$this->_writerParts['meta'] 	= new PHPWord_Writer_ODText_Meta();
 		$this->_writerParts['mimetype'] = new PHPWord_Writer_ODText_Mimetype();
+		$this->_writerParts['styles'] 	= new PHPWord_Writer_ODText_Styles();
 
 
 		// Assign parent IWriter
@@ -99,7 +100,7 @@ public function __construct(PHPWord $pPHPWord = null)
 	 */
 	public function save($pFilename = null)
 	{
-		if (!is_null($this->_presentation)) {
+		if (!is_null($this->_document)) {
 			// If $pFilename is php://output or php://stdout, make it a temporary file...
 			$originalFilename = $pFilename;
 			if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
@@ -123,16 +124,19 @@ public function save($pFilename = null)
 
 			// Add mimetype to ZIP file
 			//@todo Not in ZIPARCHIVE::CM_STORE mode
-			$objZip->addFromString('mimetype', $this->getWriterPart('mimetype')->writeMimetype($this->_presentation));
+			$objZip->addFromString('mimetype', $this->getWriterPart('mimetype')->writeMimetype($this->_document));
 
 			// Add content.xml to ZIP file
-			$objZip->addFromString('content.xml', $this->getWriterPart('content')->writeContent($this->_presentation));
+			$objZip->addFromString('content.xml', $this->getWriterPart('content')->writeContent($this->_document));
 
 			// Add meta.xml to ZIP file
-			$objZip->addFromString('meta.xml', $this->getWriterPart('meta')->writeMeta($this->_presentation));
+			$objZip->addFromString('meta.xml', $this->getWriterPart('meta')->writeMeta($this->_document));
+			
+			// Add styles.xml to ZIP file
+			$objZip->addFromString('styles.xml', $this->getWriterPart('styles')->writeStyles($this->_document));
 
 			// Add META-INF/manifest.xml
-			$objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('manifest')->writeManifest($this->_presentation));
+			$objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('manifest')->writeManifest($this->_document));
 
 			// Add media
 			for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
@@ -192,8 +196,8 @@ public function save($pFilename = null)
 	 * @throws Exception
 	 */
 	public function getPHPWord() {
-		if (!is_null($this->_presentation)) {
-			return $this->_presentation;
+		if (!is_null($this->_document)) {
+			return $this->_document;
 		} else {
 			throw new Exception("No PHPWord assigned.");
 		}
@@ -207,7 +211,7 @@ public function getPHPWord() {
 	 * @return PHPWord_Writer_PowerPoint2007
 	 */
 	public function setPHPWord(PHPWord $pPHPWord = null) {
-		$this->_presentation = $pPHPWord;
+		$this->_document = $pPHPWord;
 		return $this;
 	}