From 4bd9df5c81a263c3caa33878155d60d7d2610c6d Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 17 Aug 2013 13:36:13 +0100
Subject: [PATCH] Merge fix to style duplication from the 1.x develop branch

---
 Classes/PHPExcel/Style.php     | 28 ++++++++++++++--------------
 Classes/PHPExcel/Worksheet.php |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Classes/PHPExcel/Style.php b/Classes/PHPExcel/Style.php
index 482aafc..4a16164 100644
--- a/Classes/PHPExcel/Style.php
+++ b/Classes/PHPExcel/Style.php
@@ -424,7 +424,7 @@ class Style extends Style_Supervisor implements IComparable
                     $newStyle = clone $style;
                     $newStyle->applyFromArray($pStyles);
 
-                    if ($workbook->cellXfExists($newStyle)) {
+                    if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
                         // there is already such cell Xf in our collection
                         $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
                     } else {
@@ -597,9 +597,9 @@ class Style extends Style_Supervisor implements IComparable
      */
     public function getQuotePrefix()
     {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getQuotePrefix();
-		}
+        if ($this->_isSupervisor) {
+            return $this->getSharedComponent()->getQuotePrefix();
+        }
         return $this->_quotePrefix;
     }
 
@@ -610,16 +610,16 @@ class Style extends Style_Supervisor implements IComparable
      */
     public function setQuotePrefix($pValue)
     {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = array('quotePrefix' => $pValue);
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_quotePrefix = (boolean) $pValue;
-		}
-		return $this;
+        if ($pValue == '') {
+            $pValue = false;
+        }
+        if ($this->_isSupervisor) {
+            $styleArray = array('quotePrefix' => $pValue);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->_quotePrefix = (boolean) $pValue;
+        }
+        return $this;
     }
 
     /**
diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php
index eb96a15..eba0b2e 100644
--- a/Classes/PHPExcel/Worksheet.php
+++ b/Classes/PHPExcel/Worksheet.php
@@ -1478,9 +1478,9 @@ class Worksheet implements IComparable
 
         // Add the style to the workbook if necessary
         $workbook = $this->_parent;
-        if ($this->_parent->cellXfExists($pCellStyle)) {
-            // there is already this cell Xf in our collection
-            $xfIndex = $pCellStyle->getIndex();
+        if ($existingStyle = $this->_parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
+            // there is already such cell Xf in our collection
+            $xfIndex = $existingStyle->getIndex();
         } else {
             // we don't have such a cell Xf, need to add
             $workbook->addCellXf($pCellStyle);