Update library PHPExcel to version 1.7.3
This commit is contained in:
@@ -8,12 +8,12 @@
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
@@ -22,25 +22,10 @@
|
||||
* @package PHPExcel_Style
|
||||
* @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version 1.7.2, 2010-01-11
|
||||
* @version 1.7.3, 2010-05-17
|
||||
*/
|
||||
|
||||
|
||||
/** PHPExcel root directory */
|
||||
if (!defined('PHPEXCEL_ROOT')) {
|
||||
/**
|
||||
* @ignore
|
||||
*/
|
||||
define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
|
||||
}
|
||||
|
||||
/** PHPExcel_Style_Color */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/Style/Color.php';
|
||||
|
||||
/** PHPExcel_IComparable */
|
||||
require_once PHPEXCEL_ROOT . 'PHPExcel/IComparable.php';
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_Style_Fill
|
||||
*
|
||||
@@ -79,28 +64,28 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
* @var string
|
||||
*/
|
||||
private $_fillType;
|
||||
|
||||
|
||||
/**
|
||||
* Rotation
|
||||
*
|
||||
* @var double
|
||||
*/
|
||||
private $_rotation;
|
||||
|
||||
|
||||
/**
|
||||
* Start color
|
||||
*
|
||||
*
|
||||
* @var PHPExcel_Style_Color
|
||||
*/
|
||||
private $_startColor;
|
||||
|
||||
|
||||
/**
|
||||
* End color
|
||||
*
|
||||
*
|
||||
* @var PHPExcel_Style_Color
|
||||
*/
|
||||
private $_endColor;
|
||||
|
||||
|
||||
/**
|
||||
* Parent Borders
|
||||
*
|
||||
@@ -221,7 +206,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
|
||||
/**
|
||||
* Apply styles from array
|
||||
*
|
||||
*
|
||||
* <code>
|
||||
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
|
||||
* array(
|
||||
@@ -236,7 +221,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
* )
|
||||
* );
|
||||
* </code>
|
||||
*
|
||||
*
|
||||
* @param array $pStyles Array containing style information
|
||||
* @throws Exception
|
||||
* @return PHPExcel_Style_Fill
|
||||
@@ -267,7 +252,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get Fill Type
|
||||
*
|
||||
@@ -279,7 +264,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this->_fillType;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Fill Type
|
||||
*
|
||||
@@ -295,7 +280,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get Rotation
|
||||
*
|
||||
@@ -307,7 +292,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this->_rotation;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Rotation
|
||||
*
|
||||
@@ -323,7 +308,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get Start Color
|
||||
*
|
||||
@@ -332,7 +317,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
public function getStartColor() {
|
||||
return $this->_startColor;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Start Color
|
||||
*
|
||||
@@ -343,7 +328,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
public function setStartColor(PHPExcel_Style_Color $pValue = null) {
|
||||
// make sure parameter is a real color and not a supervisor
|
||||
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
|
||||
|
||||
|
||||
if ($this->_isSupervisor) {
|
||||
$styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB()));
|
||||
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
|
||||
@@ -352,7 +337,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get End Color
|
||||
*
|
||||
@@ -361,7 +346,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
public function getEndColor() {
|
||||
return $this->_endColor;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set End Color
|
||||
*
|
||||
@@ -372,7 +357,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
public function setEndColor(PHPExcel_Style_Color $pValue = null) {
|
||||
// make sure parameter is a real color and not a supervisor
|
||||
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
|
||||
|
||||
|
||||
if ($this->_isSupervisor) {
|
||||
$styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB()));
|
||||
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
|
||||
@@ -386,7 +371,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
* Get hash code
|
||||
*
|
||||
* @return string Hash code
|
||||
*/
|
||||
*/
|
||||
public function getHashCode() {
|
||||
if ($this->_isSupervisor) {
|
||||
return $this->getSharedComponent()->getHashCode();
|
||||
@@ -399,7 +384,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
|
||||
. __CLASS__
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Implement PHP __clone to create a deep clone, not just a shallow copy.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user