[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11349] api: update PHPExcel from upstream
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11349] api: update PHPExcel from upstream |
|
Date: |
Fri, 04 Oct 2013 13:26:15 +0000 |
Revision: 11349
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11349
Author: sigurdne
Date: 2013-10-04 13:26:13 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
api: update PHPExcel from upstream
Modified Paths:
--------------
trunk/phpgwapi/inc/phpexcel/PHPExcel.php
trunk/phpgwapi/inc/phpexcel/install.txt
trunk/phpgwapi/inc/phpexcel/license.txt
Modified: trunk/phpgwapi/inc/phpexcel/PHPExcel.php
===================================================================
--- trunk/phpgwapi/inc/phpexcel/PHPExcel.php 2013-10-04 11:41:47 UTC (rev
11348)
+++ trunk/phpgwapi/inc/phpexcel/PHPExcel.php 2013-10-04 13:26:13 UTC (rev
11349)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,16 +20,16 @@
*
* @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 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ * @version 1.7.9, 2013-06-02
*/
/** PHPExcel root directory */
if (!defined('PHPEXCEL_ROOT')) {
- define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
- require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+ define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
+ require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
}
@@ -38,165 +38,202 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel
{
- /**
- * Document properties
- *
- * @var PHPExcel_DocumentProperties
- */
- private $_properties;
+ /**
+ * Unique ID
+ *
+ * @var string
+ */
+ private $_uniqueID;
- /**
- * Document security
- *
- * @var PHPExcel_DocumentSecurity
- */
- private $_security;
+ /**
+ * Document properties
+ *
+ * @var PHPExcel_DocumentProperties
+ */
+ private $_properties;
- /**
- * Collection of Worksheet objects
- *
- * @var PHPExcel_Worksheet[]
- */
- private $_workSheetCollection = array();
+ /**
+ * Document security
+ *
+ * @var PHPExcel_DocumentSecurity
+ */
+ private $_security;
- /**
- * Active sheet index
- *
- * @var int
- */
- private $_activeSheetIndex = 0;
+ /**
+ * Collection of Worksheet objects
+ *
+ * @var PHPExcel_Worksheet[]
+ */
+ private $_workSheetCollection = array();
- /**
- * Named ranges
+ /**
+ * Calculation Engine
*
- * @var PHPExcel_NamedRange[]
+ * @var PHPExcel_Calculation
*/
- private $_namedRanges = array();
+ private $_calculationEngine = NULL;
- /**
- * CellXf supervisor
- *
- * @var PHPExcel_Style
- */
- private $_cellXfSupervisor;
+ /**
+ * Active sheet index
+ *
+ * @var int
+ */
+ private $_activeSheetIndex = 0;
- /**
- * CellXf collection
- *
- * @var PHPExcel_Style[]
- */
- private $_cellXfCollection = array();
+ /**
+ * Named ranges
+ *
+ * @var PHPExcel_NamedRange[]
+ */
+ private $_namedRanges = array();
- /**
- * CellStyleXf collection
- *
- * @var PHPExcel_Style[]
- */
- private $_cellStyleXfCollection = array();
+ /**
+ * CellXf supervisor
+ *
+ * @var PHPExcel_Style
+ */
+ private $_cellXfSupervisor;
- /**
- * Create a new PHPExcel with one Worksheet
- */
- public function __construct()
- {
- // Initialise worksheet collection and add one worksheet
- $this->_workSheetCollection = array();
- $this->_workSheetCollection[] = new PHPExcel_Worksheet($this);
- $this->_activeSheetIndex = 0;
+ /**
+ * CellXf collection
+ *
+ * @var PHPExcel_Style[]
+ */
+ private $_cellXfCollection = array();
- // Create document properties
- $this->_properties = new PHPExcel_DocumentProperties();
+ /**
+ * CellStyleXf collection
+ *
+ * @var PHPExcel_Style[]
+ */
+ private $_cellStyleXfCollection = array();
- // Create document security
- $this->_security = new PHPExcel_DocumentSecurity();
+ /**
+ * Create a new PHPExcel with one Worksheet
+ */
+ public function __construct()
+ {
+ $this->_uniqueID = uniqid();
+ $this->_calculationEngine =
PHPExcel_Calculation::getInstance($this);
- // Set named ranges
- $this->_namedRanges = array();
+ // Initialise worksheet collection and add one worksheet
+ $this->_workSheetCollection = array();
+ $this->_workSheetCollection[] = new PHPExcel_Worksheet($this);
+ $this->_activeSheetIndex = 0;
- // Create the cellXf supervisor
- $this->_cellXfSupervisor = new PHPExcel_Style(true);
- $this->_cellXfSupervisor->bindParent($this);
+ // Create document properties
+ $this->_properties = new PHPExcel_DocumentProperties();
- // Create the default style
- $this->addCellXf(new PHPExcel_Style);
- $this->addCellStyleXf(new PHPExcel_Style);
- }
+ // Create document security
+ $this->_security = new PHPExcel_DocumentSecurity();
+ // Set named ranges
+ $this->_namedRanges = array();
- /**
- * Disconnect all worksheets from this PHPExcel workbook object,
- * typically so that the PHPExcel object can be unset
- *
- */
- public function disconnectWorksheets() {
- foreach($this->_workSheetCollection as $k => &$worksheet) {
- $worksheet->disconnectCells();
- $this->_workSheetCollection[$k] = null;
- }
- unset($worksheet);
- $this->_workSheetCollection = array();
- }
+ // Create the cellXf supervisor
+ $this->_cellXfSupervisor = new PHPExcel_Style(true);
+ $this->_cellXfSupervisor->bindParent($this);
- /**
- * Get properties
- *
- * @return PHPExcel_DocumentProperties
- */
- public function getProperties()
- {
- return $this->_properties;
- }
+ // Create the default style
+ $this->addCellXf(new PHPExcel_Style);
+ $this->addCellStyleXf(new PHPExcel_Style);
+ }
- /**
- * Set properties
- *
- * @param PHPExcel_DocumentProperties $pValue
- */
- public function setProperties(PHPExcel_DocumentProperties $pValue)
- {
- $this->_properties = $pValue;
- }
+ /**
+ * Code to execute when this worksheet is unset()
+ *
+ */
+ public function __destruct() {
+ PHPExcel_Calculation::unsetInstance($this);
+ $this->disconnectWorksheets();
+ } // function __destruct()
- /**
- * Get security
- *
- * @return PHPExcel_DocumentSecurity
- */
- public function getSecurity()
- {
- return $this->_security;
- }
+ /**
+ * Disconnect all worksheets from this PHPExcel workbook object,
+ * typically so that the PHPExcel object can be unset
+ *
+ */
+ public function disconnectWorksheets()
+ {
+ $worksheet = NULL;
+ foreach($this->_workSheetCollection as $k => &$worksheet) {
+ $worksheet->disconnectCells();
+ $this->_workSheetCollection[$k] = null;
+ }
+ unset($worksheet);
+ $this->_workSheetCollection = array();
+ }
/**
- * Set security
+ * Return the calculation engine for this worksheet
*
- * @param PHPExcel_DocumentSecurity $pValue
+ * @return PHPExcel_Calculation
*/
- public function setSecurity(PHPExcel_DocumentSecurity $pValue)
+ public function getCalculationEngine()
{
- $this->_security = $pValue;
- }
+ return $this->_calculationEngine;
+ } // function getCellCacheController()
- /**
- * Get active sheet
- *
- * @return PHPExcel_Worksheet
- */
- public function getActiveSheet()
- {
- return $this->_workSheetCollection[$this->_activeSheetIndex];
- }
+ /**
+ * Get properties
+ *
+ * @return PHPExcel_DocumentProperties
+ */
+ public function getProperties()
+ {
+ return $this->_properties;
+ }
/**
+ * Set properties
+ *
+ * @param PHPExcel_DocumentProperties $pValue
+ */
+ public function setProperties(PHPExcel_DocumentProperties $pValue)
+ {
+ $this->_properties = $pValue;
+ }
+
+ /**
+ * Get security
+ *
+ * @return PHPExcel_DocumentSecurity
+ */
+ public function getSecurity()
+ {
+ return $this->_security;
+ }
+
+ /**
+ * Set security
+ *
+ * @param PHPExcel_DocumentSecurity $pValue
+ */
+ public function setSecurity(PHPExcel_DocumentSecurity $pValue)
+ {
+ $this->_security = $pValue;
+ }
+
+ /**
+ * Get active sheet
+ *
+ * @return PHPExcel_Worksheet
+ */
+ public function getActiveSheet()
+ {
+ return $this->_workSheetCollection[$this->_activeSheetIndex];
+ }
+
+ /**
* Create sheet and add it to this workbook
*
- * @param int|null $iSheetIndex Index where sheet should go (0,1,...,
or null for last)
+ * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or
null for last)
* @return PHPExcel_Worksheet
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function createSheet($iSheetIndex = NULL)
{
@@ -206,33 +243,35 @@
}
/**
- * Chech if a sheet with a specified name already exists
+ * Check if a sheet with a specified name already exists
*
- * @param string $pSheetName Name of the worksheet to check
+ * @param string $pSheetName Name of the worksheet to check
* @return boolean
*/
public function sheetNameExists($pSheetName)
{
- return ($this->getSheetByName($pSheetName) !== NULL);
+ return ($this->getSheetByName($pSheetName) !== NULL);
}
/**
* Add sheet
*
- * @param PHPExcel_Worksheet $pSheet
- * @param int|null $iSheetIndex Index where sheet should go (0,1,...,
or null for last)
+ * @param PHPExcel_Worksheet $pSheet
+ * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or
null for last)
* @return PHPExcel_Worksheet
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
{
- if ($this->sheetNameExists($pSheet->getTitle())) {
- throw new Exception("Workbook already contains a
worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first.");
- }
+ if ($this->sheetNameExists($pSheet->getTitle())) {
+ throw new PHPExcel_Exception(
+ "Workbook already contains a worksheet named
'{$pSheet->getTitle()}'. Rename this worksheet first."
+ );
+ }
if($iSheetIndex === NULL) {
if ($this->_activeSheetIndex < 0) {
- $this->_activeSheetIndex = 0;
+ $this->_activeSheetIndex = 0;
}
$this->_workSheetCollection[] = $pSheet;
} else {
@@ -244,104 +283,115 @@
array($pSheet)
);
- // Adjust active sheet index if necessary
- if ($this->_activeSheetIndex >= $iSheetIndex) {
- ++$this->_activeSheetIndex;
- }
+ // Adjust active sheet index if necessary
+ if ($this->_activeSheetIndex >= $iSheetIndex) {
+ ++$this->_activeSheetIndex;
+ }
}
- return $pSheet;
+ return $pSheet;
}
- /**
- * Remove sheet by index
- *
- * @param int $pIndex Active sheet index
- * @throws Exception
- */
- public function removeSheetByIndex($pIndex = 0)
- {
- if ($pIndex > count($this->_workSheetCollection) - 1) {
- throw new Exception("Sheet index is out of bounds.");
- } else {
- array_splice($this->_workSheetCollection, $pIndex, 1);
- }
- // Adjust active sheet index if necessary
- if (($this->_activeSheetIndex >= $pIndex) &&
- ($pIndex > count($this->_workSheetCollection) - 1)) {
- --$this->_activeSheetIndex;
- }
+ /**
+ * Remove sheet by index
+ *
+ * @param int $pIndex Active sheet index
+ * @throws PHPExcel_Exception
+ */
+ public function removeSheetByIndex($pIndex = 0)
+ {
- }
+ $numSheets = count($this->_workSheetCollection);
- /**
- * Get sheet by index
- *
- * @param int $pIndex Sheet index
- * @return PHPExcel_Worksheet
- * @throws Exception
- */
- public function getSheet($pIndex = 0)
- {
- if ($pIndex > count($this->_workSheetCollection) - 1) {
- throw new Exception("Sheet index is out of bounds.");
- } else {
- return $this->_workSheetCollection[$pIndex];
- }
- }
+ if ($pIndex > $numSheets - 1) {
+ throw new PHPExcel_Exception(
+ "You tried to remove a sheet by the out of bounds index:
{$pIndex}. The actual number of sheets is {$numSheets}."
+ );
+ } else {
+ array_splice($this->_workSheetCollection, $pIndex, 1);
+ }
+ // Adjust active sheet index if necessary
+ if (($this->_activeSheetIndex >= $pIndex) &&
+ ($pIndex > count($this->_workSheetCollection) - 1)) {
+ --$this->_activeSheetIndex;
+ }
- /**
- * Get all sheets
- *
- * @return PHPExcel_Worksheet[]
- */
- public function getAllSheets()
- {
- return $this->_workSheetCollection;
- }
+ }
- /**
- * Get sheet by name
- *
- * @param string $pName Sheet name
- * @return PHPExcel_Worksheet
- * @throws Exception
- */
- public function getSheetByName($pName = '')
- {
- $worksheetCount = count($this->_workSheetCollection);
- for ($i = 0; $i < $worksheetCount; ++$i) {
- if ($this->_workSheetCollection[$i]->getTitle() ==
$pName) {
- return $this->_workSheetCollection[$i];
- }
- }
+ /**
+ * Get sheet by index
+ *
+ * @param int $pIndex Sheet index
+ * @return PHPExcel_Worksheet
+ * @throws PHPExcel_Exception
+ */
+ public function getSheet($pIndex = 0)
+ {
- return null;
- }
+ $numSheets = count($this->_workSheetCollection);
- /**
- * Get index for sheet
- *
- * @param PHPExcel_Worksheet $pSheet
- * @return Sheet index
- * @throws Exception
- */
- public function getIndex(PHPExcel_Worksheet $pSheet)
- {
- foreach ($this->_workSheetCollection as $key => $value) {
- if ($value->getHashCode() == $pSheet->getHashCode()) {
- return $key;
- }
- }
- }
+ if ($pIndex > $numSheets - 1) {
+ throw new PHPExcel_Exception(
+ "Your requested sheet index: {$pIndex} is out of bounds. The
actual number of sheets is {$numSheets}."
+ );
+ } else {
+ return $this->_workSheetCollection[$pIndex];
+ }
+ }
/**
- * Set index for sheet by sheet name.
- *
- * @param string $sheetName Sheet name to modify index for
- * @param int $newIndex New index for the sheet
- * @return New sheet index
- * @throws Exception
- */
+ * Get all sheets
+ *
+ * @return PHPExcel_Worksheet[]
+ */
+ public function getAllSheets()
+ {
+ return $this->_workSheetCollection;
+ }
+
+ /**
+ * Get sheet by name
+ *
+ * @param string $pName Sheet name
+ * @return PHPExcel_Worksheet
+ */
+ public function getSheetByName($pName = '')
+ {
+ $worksheetCount = count($this->_workSheetCollection);
+ for ($i = 0; $i < $worksheetCount; ++$i) {
+ if ($this->_workSheetCollection[$i]->getTitle() === $pName) {
+ return $this->_workSheetCollection[$i];
+ }
+ }
+
+ return NULL;
+ }
+
+ /**
+ * Get index for sheet
+ *
+ * @param PHPExcel_Worksheet $pSheet
+ * @return Sheet index
+ * @throws PHPExcel_Exception
+ */
+ public function getIndex(PHPExcel_Worksheet $pSheet)
+ {
+ foreach ($this->_workSheetCollection as $key => $value) {
+ if ($value->getHashCode() == $pSheet->getHashCode()) {
+ return $key;
+ }
+ }
+
+ throw new PHPExcel_Exception("Sheet does not exist.");
+ }
+
+ /**
+ * Set index for sheet by sheet name.
+ *
+ * @param string $sheetName Sheet name to modify index for
+ * @param int $newIndex New index for the sheet
+ * @return New sheet index
+ * @throws PHPExcel_Exception
+ */
public function setIndexByName($sheetName, $newIndex)
{
$oldIndex = $this->getIndex($this->getSheetByName($sheetName));
@@ -349,475 +399,497 @@
$this->_workSheetCollection,
$oldIndex,
1
- );
+ );
array_splice(
$this->_workSheetCollection,
$newIndex,
0,
$pSheet
- );
+ );
return $newIndex;
}
- /**
- * Get sheet count
- *
- * @return int
- */
- public function getSheetCount()
- {
- return count($this->_workSheetCollection);
- }
+ /**
+ * Get sheet count
+ *
+ * @return int
+ */
+ public function getSheetCount()
+ {
+ return count($this->_workSheetCollection);
+ }
- /**
- * Get active sheet index
- *
- * @return int Active sheet index
- */
- public function getActiveSheetIndex()
- {
- return $this->_activeSheetIndex;
- }
+ /**
+ * Get active sheet index
+ *
+ * @return int Active sheet index
+ */
+ public function getActiveSheetIndex()
+ {
+ return $this->_activeSheetIndex;
+ }
- /**
- * Set active sheet index
- *
- * @param int $pIndex Active sheet index
- * @throws Exception
- * @return PHPExcel_Worksheet
- */
- public function setActiveSheetIndex($pIndex = 0)
- {
- if ($pIndex > count($this->_workSheetCollection) - 1) {
- throw new Exception("Active sheet index is out of
bounds.");
- } else {
- $this->_activeSheetIndex = $pIndex;
- }
- return $this->getActiveSheet();
- }
+ /**
+ * Set active sheet index
+ *
+ * @param int $pIndex Active sheet index
+ * @throws PHPExcel_Exception
+ * @return PHPExcel_Worksheet
+ */
+ public function setActiveSheetIndex($pIndex = 0)
+ {
+ $numSheets = count($this->_workSheetCollection);
- /**
- * Set active sheet index by name
- *
- * @param string $pValue Sheet title
- * @return PHPExcel_Worksheet
- * @throws Exception
- */
- public function setActiveSheetIndexByName($pValue = '')
- {
- if (($worksheet = $this->getSheetByName($pValue)) instanceof
PHPExcel_Worksheet) {
- $this->setActiveSheetIndex($this->getIndex($worksheet));
- return $worksheet;
- }
+ if ($pIndex > $numSheets - 1) {
+ throw new PHPExcel_Exception(
+ "You tried to set a sheet active by the out of bounds index:
{$pIndex}. The actual number of sheets is {$numSheets}."
+ );
+ } else {
+ $this->_activeSheetIndex = $pIndex;
+ }
+ return $this->getActiveSheet();
+ }
- throw new Exception('Workbook does not contain sheet:' .
$pValue);
- }
+ /**
+ * Set active sheet index by name
+ *
+ * @param string $pValue Sheet title
+ * @return PHPExcel_Worksheet
+ * @throws PHPExcel_Exception
+ */
+ public function setActiveSheetIndexByName($pValue = '')
+ {
+ if (($worksheet = $this->getSheetByName($pValue)) instanceof
PHPExcel_Worksheet) {
+ $this->setActiveSheetIndex($this->getIndex($worksheet));
+ return $worksheet;
+ }
- /**
- * Get sheet names
- *
- * @return string[]
- */
- public function getSheetNames()
- {
- $returnValue = array();
- $worksheetCount = $this->getSheetCount();
- for ($i = 0; $i < $worksheetCount; ++$i) {
- $returnValue[] = $this->getSheet($i)->getTitle();
- }
+ throw new PHPExcel_Exception('Workbook does not contain sheet:' .
$pValue);
+ }
- return $returnValue;
- }
+ /**
+ * Get sheet names
+ *
+ * @return string[]
+ */
+ public function getSheetNames()
+ {
+ $returnValue = array();
+ $worksheetCount = $this->getSheetCount();
+ for ($i = 0; $i < $worksheetCount; ++$i) {
+ $returnValue[] = $this->getSheet($i)->getTitle();
+ }
- /**
- * Add external sheet
- *
- * @param PHPExcel_Worksheet $pSheet External sheet to add
- * @param int|null $iSheetIndex Index where sheet should go (0,1,...,
or null for last)
- * @throws Exception
- * @return PHPExcel_Worksheet
- */
- public function addExternalSheet(PHPExcel_Worksheet $pSheet,
$iSheetIndex = null) {
- if ($this->sheetNameExists($pSheet->getTitle())) {
- throw new Exception("Workbook already contains a
worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
- }
+ return $returnValue;
+ }
- // count how many cellXfs there are in this workbook currently,
we will need this below
- $countCellXfs = count($this->_cellXfCollection);
+ /**
+ * Add external sheet
+ *
+ * @param PHPExcel_Worksheet $pSheet External sheet to add
+ * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or
null for last)
+ * @throws PHPExcel_Exception
+ * @return PHPExcel_Worksheet
+ */
+ public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex
= null) {
+ if ($this->sheetNameExists($pSheet->getTitle())) {
+ throw new PHPExcel_Exception("Workbook already contains a
worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
+ }
- // copy all the shared cellXfs from the external workbook and
append them to the current
- foreach ($pSheet->getParent()->getCellXfCollection() as
$cellXf) {
- $this->addCellXf(clone $cellXf);
- }
+ // count how many cellXfs there are in this workbook currently, we
will need this below
+ $countCellXfs = count($this->_cellXfCollection);
- // move sheet to this workbook
- $pSheet->rebindParent($this);
+ // copy all the shared cellXfs from the external workbook and append
them to the current
+ foreach ($pSheet->getParent()->getCellXfCollection() as $cellXf) {
+ $this->addCellXf(clone $cellXf);
+ }
- // update the cellXfs
- foreach ($pSheet->getCellCollection(false) as $cellID) {
- $cell = $pSheet->getCell($cellID);
- $cell->setXfIndex( $cell->getXfIndex() + $countCellXfs
);
- }
+ // move sheet to this workbook
+ $pSheet->rebindParent($this);
- return $this->addSheet($pSheet, $iSheetIndex);
- }
+ // update the cellXfs
+ foreach ($pSheet->getCellCollection(false) as $cellID) {
+ $cell = $pSheet->getCell($cellID);
+ $cell->setXfIndex( $cell->getXfIndex() + $countCellXfs );
+ }
- /**
- * Get named ranges
- *
- * @return PHPExcel_NamedRange[]
- */
- public function getNamedRanges() {
- return $this->_namedRanges;
- }
+ return $this->addSheet($pSheet, $iSheetIndex);
+ }
- /**
- * Add named range
- *
- * @param PHPExcel_NamedRange $namedRange
- * @return PHPExcel
- */
- public function addNamedRange(PHPExcel_NamedRange $namedRange) {
- if ($namedRange->getScope() == null) {
- // global scope
- $this->_namedRanges[$namedRange->getName()] =
$namedRange;
- } else {
- // local scope
-
$this->_namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()]
= $namedRange;
- }
- return true;
- }
+ /**
+ * Get named ranges
+ *
+ * @return PHPExcel_NamedRange[]
+ */
+ public function getNamedRanges() {
+ return $this->_namedRanges;
+ }
- /**
- * Get named range
- *
- * @param string $namedRange
- * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global
scope
- * @return PHPExcel_NamedRange|null
- */
- public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet =
null) {
- $returnValue = null;
+ /**
+ * Add named range
+ *
+ * @param PHPExcel_NamedRange $namedRange
+ * @return PHPExcel
+ */
+ public function addNamedRange(PHPExcel_NamedRange $namedRange) {
+ if ($namedRange->getScope() == null) {
+ // global scope
+ $this->_namedRanges[$namedRange->getName()] = $namedRange;
+ } else {
+ // local scope
+
$this->_namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()]
= $namedRange;
+ }
+ return true;
+ }
- if ($namedRange != '' && ($namedRange !== NULL)) {
- // first look for global defined name
- if (isset($this->_namedRanges[$namedRange])) {
- $returnValue = $this->_namedRanges[$namedRange];
- }
+ /**
+ * Get named range
+ *
+ * @param string $namedRange
+ * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
+ * @return PHPExcel_NamedRange|null
+ */
+ public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet =
null) {
+ $returnValue = null;
- // then look for local defined name (has priority over
global defined name if both names exist)
- if (($pSheet !== NULL) &&
isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
- $returnValue =
$this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange];
- }
- }
+ if ($namedRange != '' && ($namedRange !== NULL)) {
+ // first look for global defined name
+ if (isset($this->_namedRanges[$namedRange])) {
+ $returnValue = $this->_namedRanges[$namedRange];
+ }
- return $returnValue;
- }
+ // then look for local defined name (has priority over global
defined name if both names exist)
+ if (($pSheet !== NULL) &&
isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+ $returnValue = $this->_namedRanges[$pSheet->getTitle() . '!' .
$namedRange];
+ }
+ }
- /**
- * Remove named range
- *
- * @param string $namedRange
- * @param PHPExcel_Worksheet|null $pSheet Scope: use null for global
scope.
- * @return PHPExcel
- */
- public function removeNamedRange($namedRange, PHPExcel_Worksheet
$pSheet = null) {
- if ($pSheet === NULL) {
- if (isset($this->_namedRanges[$namedRange])) {
- unset($this->_namedRanges[$namedRange]);
- }
- } else {
- if (isset($this->_namedRanges[$pSheet->getTitle() . '!'
. $namedRange])) {
- unset($this->_namedRanges[$pSheet->getTitle() .
'!' . $namedRange]);
- }
- }
- return $this;
- }
+ return $returnValue;
+ }
- /**
- * Get worksheet iterator
- *
- * @return PHPExcel_WorksheetIterator
- */
- public function getWorksheetIterator() {
- return new PHPExcel_WorksheetIterator($this);
- }
+ /**
+ * Remove named range
+ *
+ * @param string $namedRange
+ * @param PHPExcel_Worksheet|null $pSheet Scope: use null for global
scope.
+ * @return PHPExcel
+ */
+ public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet =
null) {
+ if ($pSheet === NULL) {
+ if (isset($this->_namedRanges[$namedRange])) {
+ unset($this->_namedRanges[$namedRange]);
+ }
+ } else {
+ if (isset($this->_namedRanges[$pSheet->getTitle() . '!' .
$namedRange])) {
+ unset($this->_namedRanges[$pSheet->getTitle() . '!' .
$namedRange]);
+ }
+ }
+ return $this;
+ }
- /**
- * Copy workbook (!= clone!)
- *
- * @return PHPExcel
- */
- public function copy() {
- $copied = clone $this;
+ /**
+ * Get worksheet iterator
+ *
+ * @return PHPExcel_WorksheetIterator
+ */
+ public function getWorksheetIterator() {
+ return new PHPExcel_WorksheetIterator($this);
+ }
- $worksheetCount = count($this->_workSheetCollection);
- for ($i = 0; $i < $worksheetCount; ++$i) {
- $this->_workSheetCollection[$i] =
$this->_workSheetCollection[$i]->copy();
- $this->_workSheetCollection[$i]->rebindParent($this);
- }
+ /**
+ * Copy workbook (!= clone!)
+ *
+ * @return PHPExcel
+ */
+ public function copy() {
+ $copied = clone $this;
- return $copied;
- }
+ $worksheetCount = count($this->_workSheetCollection);
+ for ($i = 0; $i < $worksheetCount; ++$i) {
+ $this->_workSheetCollection[$i] =
$this->_workSheetCollection[$i]->copy();
+ $this->_workSheetCollection[$i]->rebindParent($this);
+ }
- /**
- * Implement PHP __clone to create a deep clone, not just a shallow
copy.
- */
- public function __clone() {
- foreach($this as $key => $val) {
- if (is_object($val) || (is_array($val))) {
- $this->{$key} = unserialize(serialize($val));
- }
- }
- }
+ return $copied;
+ }
- /**
- * Get the workbook collection of cellXfs
- *
- * @return PHPExcel_Style[]
- */
- public function getCellXfCollection()
- {
- return $this->_cellXfCollection;
- }
+ /**
+ * Implement PHP __clone to create a deep clone, not just a shallow copy.
+ */
+ public function __clone() {
+ foreach($this as $key => $val) {
+ if (is_object($val) || (is_array($val))) {
+ $this->{$key} = unserialize(serialize($val));
+ }
+ }
+ }
- /**
- * Get cellXf by index
- *
- * @param int $pIndex
- * @return PHPExcel_Style
- */
- public function getCellXfByIndex($pIndex = 0)
- {
- return $this->_cellXfCollection[$pIndex];
- }
+ /**
+ * Get the workbook collection of cellXfs
+ *
+ * @return PHPExcel_Style[]
+ */
+ public function getCellXfCollection()
+ {
+ return $this->_cellXfCollection;
+ }
- /**
- * Get cellXf by hash code
- *
- * @param string $pValue
- * @return PHPExcel_Style|false
- */
- public function getCellXfByHashCode($pValue = '')
- {
- foreach ($this->_cellXfCollection as $cellXf) {
- if ($cellXf->getHashCode() == $pValue) {
- return $cellXf;
- }
- }
- return false;
- }
+ /**
+ * Get cellXf by index
+ *
+ * @param int $pIndex
+ * @return PHPExcel_Style
+ */
+ public function getCellXfByIndex($pIndex = 0)
+ {
+ return $this->_cellXfCollection[$pIndex];
+ }
- /**
- * Get default style
- *
- * @return PHPExcel_Style
- * @throws Exception
- */
- public function getDefaultStyle()
- {
- if (isset($this->_cellXfCollection[0])) {
- return $this->_cellXfCollection[0];
- }
- throw new Exception('No default style found for this workbook');
- }
+ /**
+ * Get cellXf by hash code
+ *
+ * @param string $pValue
+ * @return PHPExcel_Style|false
+ */
+ public function getCellXfByHashCode($pValue = '')
+ {
+ foreach ($this->_cellXfCollection as $cellXf) {
+ if ($cellXf->getHashCode() == $pValue) {
+ return $cellXf;
+ }
+ }
+ return false;
+ }
- /**
- * Add a cellXf to the workbook
- *
- * @param PHPExcel_Style $style
- */
- public function addCellXf(PHPExcel_Style $style)
- {
- $this->_cellXfCollection[] = $style;
- $style->setIndex(count($this->_cellXfCollection) - 1);
- }
+ /**
+ * Check if style exists in style collection
+ *
+ * @param PHPExcel_Style $pCellStyle
+ * @return boolean
+ */
+ public function cellXfExists($pCellStyle = null)
+ {
+ return in_array($pCellStyle, $this->_cellXfCollection, true);
+ }
- /**
- * Remove cellXf by index. It is ensured that all cells get their xf
index updated.
- *
- * @param int $pIndex Index to cellXf
- * @throws Exception
- */
- public function removeCellXfByIndex($pIndex = 0)
- {
- if ($pIndex > count($this->_cellXfCollection) - 1) {
- throw new Exception("CellXf index is out of bounds.");
- } else {
- // first remove the cellXf
- array_splice($this->_cellXfCollection, $pIndex, 1);
+ /**
+ * Get default style
+ *
+ * @return PHPExcel_Style
+ * @throws PHPExcel_Exception
+ */
+ public function getDefaultStyle()
+ {
+ if (isset($this->_cellXfCollection[0])) {
+ return $this->_cellXfCollection[0];
+ }
+ throw new PHPExcel_Exception('No default style found for this
workbook');
+ }
- // then update cellXf indexes for cells
- foreach ($this->_workSheetCollection as $worksheet) {
- foreach ($worksheet->getCellCollection(false)
as $cellID) {
- $cell = $worksheet->getCell($cellID);
- $xfIndex = $cell->getXfIndex();
- if ($xfIndex > $pIndex ) {
- // decrease xf index by 1
- $cell->setXfIndex($xfIndex - 1);
- } else if ($xfIndex == $pIndex) {
- // set to default xf index 0
- $cell->setXfIndex(0);
- }
- }
- }
- }
- }
+ /**
+ * Add a cellXf to the workbook
+ *
+ * @param PHPExcel_Style $style
+ */
+ public function addCellXf(PHPExcel_Style $style)
+ {
+ $this->_cellXfCollection[] = $style;
+ $style->setIndex(count($this->_cellXfCollection) - 1);
+ }
- /**
- * Get the cellXf supervisor
- *
- * @return PHPExcel_Style
- */
- public function getCellXfSupervisor()
- {
- return $this->_cellXfSupervisor;
- }
+ /**
+ * Remove cellXf by index. It is ensured that all cells get their xf index
updated.
+ *
+ * @param int $pIndex Index to cellXf
+ * @throws PHPExcel_Exception
+ */
+ public function removeCellXfByIndex($pIndex = 0)
+ {
+ if ($pIndex > count($this->_cellXfCollection) - 1) {
+ throw new PHPExcel_Exception("CellXf index is out of bounds.");
+ } else {
+ // first remove the cellXf
+ array_splice($this->_cellXfCollection, $pIndex, 1);
- /**
- * Get the workbook collection of cellStyleXfs
- *
- * @return PHPExcel_Style[]
- */
- public function getCellStyleXfCollection()
- {
- return $this->_cellStyleXfCollection;
- }
+ // then update cellXf indexes for cells
+ foreach ($this->_workSheetCollection as $worksheet) {
+ foreach ($worksheet->getCellCollection(false) as $cellID) {
+ $cell = $worksheet->getCell($cellID);
+ $xfIndex = $cell->getXfIndex();
+ if ($xfIndex > $pIndex ) {
+ // decrease xf index by 1
+ $cell->setXfIndex($xfIndex - 1);
+ } else if ($xfIndex == $pIndex) {
+ // set to default xf index 0
+ $cell->setXfIndex(0);
+ }
+ }
+ }
+ }
+ }
- /**
- * Get cellStyleXf by index
- *
- * @param int $pIndex
- * @return PHPExcel_Style
- */
- public function getCellStyleXfByIndex($pIndex = 0)
- {
- return $this->_cellStyleXfCollection[$pIndex];
- }
+ /**
+ * Get the cellXf supervisor
+ *
+ * @return PHPExcel_Style
+ */
+ public function getCellXfSupervisor()
+ {
+ return $this->_cellXfSupervisor;
+ }
- /**
- * Get cellStyleXf by hash code
- *
- * @param string $pValue
- * @return PHPExcel_Style|false
- */
- public function getCellStyleXfByHashCode($pValue = '')
- {
- foreach ($this->_cellXfStyleCollection as $cellStyleXf) {
- if ($cellStyleXf->getHashCode() == $pValue) {
- return $cellStyleXf;
- }
- }
- return false;
- }
+ /**
+ * Get the workbook collection of cellStyleXfs
+ *
+ * @return PHPExcel_Style[]
+ */
+ public function getCellStyleXfCollection()
+ {
+ return $this->_cellStyleXfCollection;
+ }
- /**
- * Add a cellStyleXf to the workbook
- *
- * @param PHPExcel_Style $pStyle
- */
- public function addCellStyleXf(PHPExcel_Style $pStyle)
- {
- $this->_cellStyleXfCollection[] = $pStyle;
- $pStyle->setIndex(count($this->_cellStyleXfCollection) - 1);
- }
+ /**
+ * Get cellStyleXf by index
+ *
+ * @param int $pIndex
+ * @return PHPExcel_Style
+ */
+ public function getCellStyleXfByIndex($pIndex = 0)
+ {
+ return $this->_cellStyleXfCollection[$pIndex];
+ }
- /**
- * Remove cellStyleXf by index
- *
- * @param int $pIndex
- * @throws Exception
- */
- public function removeCellStyleXfByIndex($pIndex = 0)
- {
- if ($pIndex > count($this->_cellStyleXfCollection) - 1) {
- throw new Exception("CellStyleXf index is out of
bounds.");
- } else {
- array_splice($this->_cellStyleXfCollection, $pIndex, 1);
- }
- }
+ /**
+ * Get cellStyleXf by hash code
+ *
+ * @param string $pValue
+ * @return PHPExcel_Style|false
+ */
+ public function getCellStyleXfByHashCode($pValue = '')
+ {
+ foreach ($this->_cellXfStyleCollection as $cellStyleXf) {
+ if ($cellStyleXf->getHashCode() == $pValue) {
+ return $cellStyleXf;
+ }
+ }
+ return false;
+ }
- /**
- * Eliminate all unneeded cellXf and afterwards update the xfIndex for
all cells
- * and columns in the workbook
- */
- public function garbageCollect()
- {
- // how many references are there to each cellXf ?
- $countReferencesCellXf = array();
- foreach ($this->_cellXfCollection as $index => $cellXf) {
- $countReferencesCellXf[$index] = 0;
- }
+ /**
+ * Add a cellStyleXf to the workbook
+ *
+ * @param PHPExcel_Style $pStyle
+ */
+ public function addCellStyleXf(PHPExcel_Style $pStyle)
+ {
+ $this->_cellStyleXfCollection[] = $pStyle;
+ $pStyle->setIndex(count($this->_cellStyleXfCollection) - 1);
+ }
- foreach ($this->getWorksheetIterator() as $sheet) {
+ /**
+ * Remove cellStyleXf by index
+ *
+ * @param int $pIndex
+ * @throws PHPExcel_Exception
+ */
+ public function removeCellStyleXfByIndex($pIndex = 0)
+ {
+ if ($pIndex > count($this->_cellStyleXfCollection) - 1) {
+ throw new PHPExcel_Exception("CellStyleXf index is out of
bounds.");
+ } else {
+ array_splice($this->_cellStyleXfCollection, $pIndex, 1);
+ }
+ }
- // from cells
- foreach ($sheet->getCellCollection(false) as $cellID) {
- $cell = $sheet->getCell($cellID);
- ++$countReferencesCellXf[$cell->getXfIndex()];
- }
+ /**
+ * Eliminate all unneeded cellXf and afterwards update the xfIndex for all
cells
+ * and columns in the workbook
+ */
+ public function garbageCollect()
+ {
+ // how many references are there to each cellXf ?
+ $countReferencesCellXf = array();
+ foreach ($this->_cellXfCollection as $index => $cellXf) {
+ $countReferencesCellXf[$index] = 0;
+ }
- // from row dimensions
- foreach ($sheet->getRowDimensions() as $rowDimension) {
- if ($rowDimension->getXfIndex() !== null) {
-
++$countReferencesCellXf[$rowDimension->getXfIndex()];
- }
- }
+ foreach ($this->getWorksheetIterator() as $sheet) {
- // from column dimensions
- foreach ($sheet->getColumnDimensions() as
$columnDimension) {
-
++$countReferencesCellXf[$columnDimension->getXfIndex()];
- }
- }
+ // from cells
+ foreach ($sheet->getCellCollection(false) as $cellID) {
+ $cell = $sheet->getCell($cellID);
+ ++$countReferencesCellXf[$cell->getXfIndex()];
+ }
- // remove cellXfs without references and create mapping so we
can update xfIndex
- // for all cells and columns
- $countNeededCellXfs = 0;
- foreach ($this->_cellXfCollection as $index => $cellXf) {
- if ($countReferencesCellXf[$index] > 0 || $index == 0)
{ // we must never remove the first cellXf
- ++$countNeededCellXfs;
- } else {
- unset($this->_cellXfCollection[$index]);
- }
- $map[$index] = $countNeededCellXfs - 1;
- }
- $this->_cellXfCollection =
array_values($this->_cellXfCollection);
+ // from row dimensions
+ foreach ($sheet->getRowDimensions() as $rowDimension) {
+ if ($rowDimension->getXfIndex() !== null) {
+ ++$countReferencesCellXf[$rowDimension->getXfIndex()];
+ }
+ }
- // update the index for all cellXfs
- foreach ($this->_cellXfCollection as $i => $cellXf) {
- $cellXf->setIndex($i);
- }
+ // from column dimensions
+ foreach ($sheet->getColumnDimensions() as $columnDimension) {
+ ++$countReferencesCellXf[$columnDimension->getXfIndex()];
+ }
+ }
- // make sure there is always at least one cellXf (there should
be)
- if (empty($this->_cellXfCollection)) {
- $this->_cellXfCollection[] = new PHPExcel_Style();
- }
+ // remove cellXfs without references and create mapping so we can
update xfIndex
+ // for all cells and columns
+ $countNeededCellXfs = 0;
+ foreach ($this->_cellXfCollection as $index => $cellXf) {
+ if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we
must never remove the first cellXf
+ ++$countNeededCellXfs;
+ } else {
+ unset($this->_cellXfCollection[$index]);
+ }
+ $map[$index] = $countNeededCellXfs - 1;
+ }
+ $this->_cellXfCollection = array_values($this->_cellXfCollection);
- // update the xfIndex for all cells, row dimensions, column
dimensions
- foreach ($this->getWorksheetIterator() as $sheet) {
+ // update the index for all cellXfs
+ foreach ($this->_cellXfCollection as $i => $cellXf) {
+ $cellXf->setIndex($i);
+ }
- // for all cells
- foreach ($sheet->getCellCollection(false) as $cellID) {
- $cell = $sheet->getCell($cellID);
- $cell->setXfIndex( $map[$cell->getXfIndex()] );
- }
+ // make sure there is always at least one cellXf (there should be)
+ if (empty($this->_cellXfCollection)) {
+ $this->_cellXfCollection[] = new PHPExcel_Style();
+ }
- // for all row dimensions
- foreach ($sheet->getRowDimensions() as $rowDimension) {
- if ($rowDimension->getXfIndex() !== null) {
- $rowDimension->setXfIndex(
$map[$rowDimension->getXfIndex()] );
- }
- }
+ // update the xfIndex for all cells, row dimensions, column dimensions
+ foreach ($this->getWorksheetIterator() as $sheet) {
- // for all column dimensions
- foreach ($sheet->getColumnDimensions() as
$columnDimension) {
- $columnDimension->setXfIndex(
$map[$columnDimension->getXfIndex()] );
- }
- }
+ // for all cells
+ foreach ($sheet->getCellCollection(false) as $cellID) {
+ $cell = $sheet->getCell($cellID);
+ $cell->setXfIndex( $map[$cell->getXfIndex()] );
+ }
- // also do garbage collection for all the sheets
- foreach ($this->getWorksheetIterator() as $sheet) {
- $sheet->garbageCollect();
- }
- }
+ // for all row dimensions
+ foreach ($sheet->getRowDimensions() as $rowDimension) {
+ if ($rowDimension->getXfIndex() !== null) {
+ $rowDimension->setXfIndex(
$map[$rowDimension->getXfIndex()] );
+ }
+ }
+ // for all column dimensions
+ foreach ($sheet->getColumnDimensions() as $columnDimension) {
+ $columnDimension->setXfIndex(
$map[$columnDimension->getXfIndex()] );
+ }
+
+ // also do garbage collection for all the sheets
+ $sheet->garbageCollect();
+ }
+ }
+
+ /**
+ * Return the unique ID value assigned to this spreadsheet workbook
+ *
+ * @return string
+ */
+ public function getID() {
+ return $this->_uniqueID;
+ }
+
}
Modified: trunk/phpgwapi/inc/phpexcel/install.txt
===================================================================
--- trunk/phpgwapi/inc/phpexcel/install.txt 2013-10-04 11:41:47 UTC (rev
11348)
+++ trunk/phpgwapi/inc/phpexcel/install.txt 2013-10-04 13:26:13 UTC (rev
11349)
@@ -7,19 +7,19 @@
* 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
*
-* @copyright Copyright (c) 2006 - 2011 PHPExcel
(http://www.codeplex.com/PHPExcel)
+* @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
-* @version 1.7.7, 2012-05-19
+* @version 1.7.9, 2013-06-02
**************************************************************************************
Requirements
@@ -59,16 +59,16 @@
---------------
A good way to get started is to run some of the tests included in the download.
-Copy the "Tests" folder next to your "Classes" folder from above so you end up
with:
+Copy the "Examples" folder next to your "Classes" folder from above so you end
up with:
-/var/www/Tests/01simple.php
-/var/www/Tests/02types.php
+/var/www/Examples/01simple.php
+/var/www/Examples/02types.php
...
Start running the test by pointing your browser to the test scripts:
-http://example.com/Tests/01simple.php
-http://example.com/Tests/02types.php
+http://example.com/Examples/01simple.php
+http://example.com/Examples/02types.php
...
Note: It may be necessary to modify the include/require statements at the
beginning of
Modified: trunk/phpgwapi/inc/phpexcel/license.txt
===================================================================
--- trunk/phpgwapi/inc/phpexcel/license.txt 2013-10-04 11:41:47 UTC (rev
11348)
+++ trunk/phpgwapi/inc/phpexcel/license.txt 2013-10-04 13:26:13 UTC (rev
11349)
@@ -1,4 +1,5 @@
- GNU LESSER GENERAL PUBLIC LICENSE
+GNU LESSER GENERAL PUBLIC LICENSE
+
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
@@ -44,7 +45,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -102,7 +103,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -153,7 +154,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -215,7 +216,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -256,7 +257,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -308,7 +309,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -318,7 +319,7 @@
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -341,4 +342,4 @@
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
\ No newline at end of file
+END OF TERMS AND CONDITIONS
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11349] api: update PHPExcel from upstream,
Sigurd Nes <=