mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-07 01:23:00 +01:00
Update PHPExcel library to 1.8.0
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* PHPExcel
|
||||
*
|
||||
* Copyright (c) 2006 - 2012 PHPExcel
|
||||
* Copyright (c) 2006 - 2014 PHPExcel
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -20,9 +20,9 @@
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel
|
||||
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version 1.7.8, 2012-10-12
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version 1.8.0, 2014-03-02
|
||||
*/
|
||||
|
||||
|
||||
@@ -33,45 +33,48 @@
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel
|
||||
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
*/
|
||||
class PHPExcel_WorksheetIterator implements Iterator
|
||||
{
|
||||
/**
|
||||
* Spreadsheet to iterate
|
||||
*
|
||||
* @var PHPExcel
|
||||
*/
|
||||
private $_subject;
|
||||
/**
|
||||
* Spreadsheet to iterate
|
||||
*
|
||||
* @var PHPExcel
|
||||
*/
|
||||
private $_subject;
|
||||
|
||||
/**
|
||||
* Current iterator position
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $_position = 0;
|
||||
/**
|
||||
* Current iterator position
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $_position = 0;
|
||||
|
||||
/**
|
||||
* Create a new worksheet iterator
|
||||
*
|
||||
* @param PHPExcel $subject
|
||||
*/
|
||||
public function __construct(PHPExcel $subject = null) {
|
||||
// Set subject
|
||||
$this->_subject = $subject;
|
||||
}
|
||||
/**
|
||||
* Create a new worksheet iterator
|
||||
*
|
||||
* @param PHPExcel $subject
|
||||
*/
|
||||
public function __construct(PHPExcel $subject = null)
|
||||
{
|
||||
// Set subject
|
||||
$this->_subject = $subject;
|
||||
}
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
public function __destruct() {
|
||||
unset($this->_subject);
|
||||
}
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
public function __destruct()
|
||||
{
|
||||
unset($this->_subject);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rewind iterator
|
||||
*/
|
||||
public function rewind() {
|
||||
/**
|
||||
* Rewind iterator
|
||||
*/
|
||||
public function rewind()
|
||||
{
|
||||
$this->_position = 0;
|
||||
}
|
||||
|
||||
@@ -80,8 +83,9 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function current() {
|
||||
return $this->_subject->getSheet($this->_position);
|
||||
public function current()
|
||||
{
|
||||
return $this->_subject->getSheet($this->_position);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -89,14 +93,16 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function key() {
|
||||
public function key()
|
||||
{
|
||||
return $this->_position;
|
||||
}
|
||||
|
||||
/**
|
||||
* Next value
|
||||
*/
|
||||
public function next() {
|
||||
public function next()
|
||||
{
|
||||
++$this->_position;
|
||||
}
|
||||
|
||||
@@ -105,7 +111,8 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function valid() {
|
||||
public function valid()
|
||||
{
|
||||
return $this->_position < $this->_subject->getSheetCount();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user