From 84c449b74a5cf9403fd7735f4ef60b8e8639d2fa Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sun, 5 Sep 2010 14:02:26 +0000
Subject: [PATCH] Feature: Work item 8769 - Implement Gnumeric File Format Cell
 border formatting (diagonals)

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60405 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel/Reader/Gnumeric.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Classes/PHPExcel/Reader/Gnumeric.php b/Classes/PHPExcel/Reader/Gnumeric.php
index aafb7c2d..335c2b2f 100644
--- a/Classes/PHPExcel/Reader/Gnumeric.php
+++ b/Classes/PHPExcel/Reader/Gnumeric.php
@@ -595,16 +595,26 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 
 							if (isset($styleRegion->Style->StyleBorder)) {
 								if (isset($styleRegion->Style->StyleBorder->Top)) {
-									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes(),'top');
+									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
 								}
 								if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes(),'bottom');
+									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
 								}
 								if (isset($styleRegion->Style->StyleBorder->Left)) {
-									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes(),'left');
+									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
 								}
 								if (isset($styleRegion->Style->StyleBorder->Right)) {
-									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes(),'right');
+									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
+								}
+								if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
+									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
+								} elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
+									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
+								} elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
+									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
+									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
 								}
 							}
 						}
@@ -707,7 +717,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
-	private static function _parseBorderAttributes($borderAttributes,$border) {
+	private static function _parseBorderAttributes($borderAttributes) {
 		$styleArray = array();
 
 		$RGB = self::_parseGnumericColour($borderAttributes["Color"]);