From 119cd7035ac286185879ab780cee39db39e620fd Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sun, 5 Sep 2010 13:32:29 +0000
Subject: [PATCH] Feature: Work item 8769 - Implement Gnumeric File Format Cell
 border formatting (not diagonals yet)

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60402 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel/Reader/Gnumeric.php | 72 +++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/Classes/PHPExcel/Reader/Gnumeric.php b/Classes/PHPExcel/Reader/Gnumeric.php
index 6563b49c..aafb7c2d 100644
--- a/Classes/PHPExcel/Reader/Gnumeric.php
+++ b/Classes/PHPExcel/Reader/Gnumeric.php
@@ -281,10 +281,12 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 							break;
 					case 'creator' :
 							$docProps->setCreator(trim($propertyValue));
+							$docProps->setLastModifiedBy(trim($propertyValue));
 							break;
 					case 'date' :
 							$creationDate = strtotime(trim($propertyValue));
 							$docProps->setCreated($creationDate);
+							$docProps->setModified($creationDate);
 							break;
 					case 'description' :
 							$docProps->setDescription(trim($propertyValue));
@@ -590,6 +592,21 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 									$styleArray['font']['subScript'] = True;
 									break;
 							}
+
+							if (isset($styleRegion->Style->StyleBorder)) {
+								if (isset($styleRegion->Style->StyleBorder->Top)) {
+									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes(),'top');
+								}
+								if (isset($styleRegion->Style->StyleBorder->Bottom)) {
+									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes(),'bottom');
+								}
+								if (isset($styleRegion->Style->StyleBorder->Left)) {
+									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes(),'left');
+								}
+								if (isset($styleRegion->Style->StyleBorder->Right)) {
+									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes(),'right');
+								}
+							}
 						}
 //						var_dump($styleArray);
 //						echo '<br />';
@@ -657,7 +674,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 				}
 			}
 
-			//	Handle Merged Cells
+			//	Handle Merged Cells in this worksheet
 			if (isset($sheet->MergedRegions)) {
 				foreach($sheet->MergedRegions->Merge as $mergeCells) {
 					$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
@@ -690,6 +707,59 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
+	private static function _parseBorderAttributes($borderAttributes,$border) {
+		$styleArray = array();
+
+		$RGB = self::_parseGnumericColour($borderAttributes["Color"]);
+		$styleArray['color']['rgb'] = $RGB;
+
+		switch ($borderAttributes["Style"]) {
+			case '0' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_NONE;
+				break;
+			case '1' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THIN;
+				break;
+			case '2' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
+				break;
+			case '4' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
+				break;
+			case '5' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THICK;
+				break;
+			case '6' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOUBLE;
+				break;
+			case '7' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
+				break;
+			case '9' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
+				break;
+			case '10' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
+				break;
+			case '11' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOTDOT;
+				break;
+			case '12' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+				break;
+			case '13' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+				break;
+			case '3' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
+				break;
+			case '8' :
+				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
+				break;
+		}
+		return $styleArray;
+	}
+
 	private static function _parseGnumericColour($gnmColour) {
 //		echo 'Gnumeric Colour: ',$gnmColour,'<br />';
 		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);