From 509bfd39e2985dbce9f88520e8d3925a9e1e46df Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Tue, 2 Jul 2013 13:13:07 +0100
Subject: [PATCH] Added Horizontal FILL alignment for Excel5 and Excel2007
 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007
 Reader/Writer

---
 Classes/PHPExcel/Reader/Excel5.php    | 9 ++++++++-
 Classes/PHPExcel/Style/Alignment.php  | 3 +++
 Classes/PHPExcel/Writer/Excel5/Xf.php | 3 ++-
 changelog.txt                         | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Classes/PHPExcel/Reader/Excel5.php b/Classes/PHPExcel/Reader/Excel5.php
index 49553697..8dc8d6c7 100644
--- a/Classes/PHPExcel/Reader/Excel5.php
+++ b/Classes/PHPExcel/Reader/Excel5.php
@@ -1569,11 +1569,15 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
 	private function _readFilepass()
 	{
 		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-//		$recordData = substr($this->_data, $this->_pos + 4, $length);
+		$recordData = substr($this->_data, $this->_pos + 4, $length);
 
 		// move stream pointer to next record
 		$this->_pos += 4 + $length;
 
+		if (!$this->_readDataOnly) {
+			// offset: 0; size: 2; 16-bit hash value of password
+			$password = strtoupper(dechex(self::_GetInt2d($recordData, 0))); // the hashed password
+        }
 		throw new PHPExcel_Reader_Exception('Cannot read encrypted file');
 	}
 
@@ -1836,6 +1840,9 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
 				case 3:
 					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
 					break;
+				case 4:
+					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_FILL);
+					break;
 				case 5:
 					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY);
 					break;
diff --git a/Classes/PHPExcel/Style/Alignment.php b/Classes/PHPExcel/Style/Alignment.php
index 5bf2fa68..f7be8f60 100644
--- a/Classes/PHPExcel/Style/Alignment.php
+++ b/Classes/PHPExcel/Style/Alignment.php
@@ -42,12 +42,15 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
 	const HORIZONTAL_CENTER					= 'center';
 	const HORIZONTAL_CENTER_CONTINUOUS		= 'centerContinuous';
 	const HORIZONTAL_JUSTIFY				= 'justify';
+	const HORIZONTAL_FILL				    = 'fill';
+	const HORIZONTAL_DISTRIBUTED		    = 'distributed';        // Excel2007 only
 
 	/* Vertical alignment styles */
 	const VERTICAL_BOTTOM					= 'bottom';
 	const VERTICAL_TOP						= 'top';
 	const VERTICAL_CENTER					= 'center';
 	const VERTICAL_JUSTIFY					= 'justify';
+	const VERTICAL_DISTRIBUTED		        = 'distributed';        // Excel2007 only
 
 	/**
 	 * Horizontal
diff --git a/Classes/PHPExcel/Writer/Excel5/Xf.php b/Classes/PHPExcel/Writer/Excel5/Xf.php
index 241b5f89..da25c2bc 100644
--- a/Classes/PHPExcel/Writer/Excel5/Xf.php
+++ b/Classes/PHPExcel/Writer/Excel5/Xf.php
@@ -179,7 +179,7 @@ class PHPExcel_Writer_Excel5_Xf
 		// Flags to indicate if attributes have been set.
 		$atr_num     = ($this->_numberFormatIndex != 0)?1:0;
 		$atr_fnt     = ($this->_fontIndex != 0)?1:0;
-		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText())?1:0;
+		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
 		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
 						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
 						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
@@ -457,6 +457,7 @@ class PHPExcel_Writer_Excel5_Xf
 										PHPExcel_Style_Alignment::HORIZONTAL_LEFT				=> 1,
 										PHPExcel_Style_Alignment::HORIZONTAL_CENTER				=> 2,
 										PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				=> 3,
+										PHPExcel_Style_Alignment::HORIZONTAL_FILL				=> 4,
 										PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY			=> 5,
 										PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS	=> 6,
 									  );
diff --git a/changelog.txt b/changelog.txt
index f7b7767f..7ff71fb0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -29,6 +29,7 @@ Fixed in develop branch for release v1.7.9a:
 - Bugfix:   (MBaker)                     - Problem with cloning worksheets
 - Feature:  (amerov)                     - Implementation of the Excel HLOOKUP() function
 - Feature:  (MBaker)                     - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only)
+- Feature:  (MBaker)                     - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer
 
 Fixed in develop branch for release v1.7.9:
 - Feature:  (MBaker)    Include charts option for HTML Writer