Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts: Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
This commit is contained in:
MarkBaker
commit
334747867d
File diff suppressed because it is too large
Load Diff
|
|
@ -752,16 +752,19 @@ class PHPExcel_Chart_Renderer_jpgraph
|
|||
switch ($chartType) {
|
||||
case 'area3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'areaChart':
|
||||
$this->renderPlotLine($i, true, true, $dimensions);
|
||||
break;
|
||||
case 'bar3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'barChart':
|
||||
$this->renderPlotBar($i, $dimensions);
|
||||
break;
|
||||
case 'line3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'lineChart':
|
||||
$this->renderPlotLine($i, false, true, $dimensions);
|
||||
break;
|
||||
|
|
@ -812,26 +815,31 @@ class PHPExcel_Chart_Renderer_jpgraph
|
|||
switch ($chartType) {
|
||||
case 'area3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'areaChart':
|
||||
$this->renderAreaChart($groupCount, $dimensions);
|
||||
break;
|
||||
case 'bar3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'barChart':
|
||||
$this->renderBarChart($groupCount, $dimensions);
|
||||
break;
|
||||
case 'line3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'lineChart':
|
||||
$this->renderLineChart($groupCount, $dimensions);
|
||||
break;
|
||||
case 'pie3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'pieChart':
|
||||
$this->renderPieChart($groupCount, $dimensions, false, false);
|
||||
break;
|
||||
case 'doughnut3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'doughnutChart':
|
||||
$this->renderPieChart($groupCount, $dimensions, true, true);
|
||||
break;
|
||||
|
|
@ -846,6 +854,7 @@ class PHPExcel_Chart_Renderer_jpgraph
|
|||
break;
|
||||
case 'surface3DChart':
|
||||
$dimensions = '3d';
|
||||
// no break
|
||||
case 'surfaceChart':
|
||||
$this->renderContourChart($groupCount, $dimensions);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @var boolean
|
||||
*/
|
||||
protected $_readDataOnly = FALSE;
|
||||
protected $_readDataOnly = false;
|
||||
|
||||
/**
|
||||
* Read charts that are defined in the workbook?
|
||||
|
|
@ -50,7 +50,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @var boolean
|
||||
*/
|
||||
protected $_includeCharts = FALSE;
|
||||
protected $_includeCharts = false;
|
||||
|
||||
/**
|
||||
* Restrict which sheets should be loaded?
|
||||
|
|
@ -58,16 +58,16 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @var array of string
|
||||
*/
|
||||
protected $_loadSheetsOnly = NULL;
|
||||
protected $_loadSheetsOnly = null;
|
||||
|
||||
/**
|
||||
* PHPExcel_Reader_IReadFilter instance
|
||||
*
|
||||
* @var PHPExcel_Reader_IReadFilter
|
||||
*/
|
||||
protected $_readFilter = NULL;
|
||||
protected $_readFilter = null;
|
||||
|
||||
protected $_fileHandle = NULL;
|
||||
protected $_fileHandle = null;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -77,7 +77,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getReadDataOnly() {
|
||||
public function getReadDataOnly()
|
||||
{
|
||||
return $this->_readDataOnly;
|
||||
}
|
||||
|
||||
|
|
@ -90,7 +91,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return PHPExcel_Reader_IReader
|
||||
*/
|
||||
public function setReadDataOnly($pValue = FALSE) {
|
||||
public function setReadDataOnly($pValue = false)
|
||||
{
|
||||
$this->_readDataOnly = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -103,7 +105,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getIncludeCharts() {
|
||||
public function getIncludeCharts()
|
||||
{
|
||||
return $this->_includeCharts;
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +120,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return PHPExcel_Reader_IReader
|
||||
*/
|
||||
public function setIncludeCharts($pValue = FALSE) {
|
||||
public function setIncludeCharts($pValue = false)
|
||||
{
|
||||
$this->_includeCharts = (boolean) $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -143,13 +147,13 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return PHPExcel_Reader_IReader
|
||||
*/
|
||||
public function setLoadSheetsOnly($value = NULL)
|
||||
public function setLoadSheetsOnly($value = null)
|
||||
{
|
||||
if ($value === NULL)
|
||||
if ($value === null) {
|
||||
return $this->setLoadAllSheets();
|
||||
}
|
||||
|
||||
$this->_loadSheetsOnly = is_array($value) ?
|
||||
$value : array($value);
|
||||
$this->_loadSheetsOnly = is_array($value) ? $value : array($value);
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +165,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*/
|
||||
public function setLoadAllSheets()
|
||||
{
|
||||
$this->_loadSheetsOnly = NULL;
|
||||
$this->_loadSheetsOnly = null;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
@ -170,7 +174,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
*
|
||||
* @return PHPExcel_Reader_IReadFilter
|
||||
*/
|
||||
public function getReadFilter() {
|
||||
public function getReadFilter()
|
||||
{
|
||||
return $this->_readFilter;
|
||||
}
|
||||
|
||||
|
|
@ -180,7 +185,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
* @param PHPExcel_Reader_IReadFilter $pValue
|
||||
* @return PHPExcel_Reader_IReader
|
||||
*/
|
||||
public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
|
||||
public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue)
|
||||
{
|
||||
$this->_readFilter = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -201,7 +207,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
|
||||
// Open file
|
||||
$this->_fileHandle = fopen($pFilename, 'r');
|
||||
if ($this->_fileHandle === FALSE) {
|
||||
if ($this->_fileHandle === false) {
|
||||
throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
|
||||
}
|
||||
}
|
||||
|
|
@ -219,11 +225,11 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
|
|||
try {
|
||||
$this->_openFile($pFilename);
|
||||
} catch (Exception $e) {
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
$readable = $this->_isValidFormat();
|
||||
fclose ($this->_fileHandle);
|
||||
fclose($this->_fileHandle);
|
||||
return $readable;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
/**
|
||||
* Create a new PHPExcel_Reader_Excel2003XML
|
||||
*/
|
||||
public function __construct() {
|
||||
public function __construct()
|
||||
{
|
||||
$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
|
||||
}
|
||||
|
||||
|
|
@ -238,8 +239,8 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
return $this->loadIntoExisting($pFilename, $objPHPExcel);
|
||||
}
|
||||
|
||||
|
||||
protected static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
|
||||
protected static function identifyFixedStyleValue($styleList,&$styleAttributeValue)
|
||||
{
|
||||
$styleAttributeValue = strtolower($styleAttributeValue);
|
||||
foreach ($styleList as $style) {
|
||||
if ($styleAttributeValue == strtolower($style)) {
|
||||
|
|
@ -250,13 +251,13 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* pixel units to excel width units(units of 1/256th of a character width)
|
||||
* @param pxs
|
||||
* @return
|
||||
*/
|
||||
protected static function _pixel2WidthUnits($pxs) {
|
||||
protected static function _pixel2WidthUnits($pxs)
|
||||
{
|
||||
$UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
|
||||
|
||||
$widthUnits = 256 * ($pxs / 7);
|
||||
|
|
@ -264,25 +265,24 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
return $widthUnits;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* excel width units(units of 1/256th of a character width) to pixel units
|
||||
* @param widthUnits
|
||||
* @return
|
||||
*/
|
||||
protected static function _widthUnits2Pixel($widthUnits) {
|
||||
protected static function _widthUnits2Pixel($widthUnits)
|
||||
{
|
||||
$pixels = ($widthUnits / 256) * 7;
|
||||
$offsetWidthUnits = $widthUnits % 256;
|
||||
$pixels += round($offsetWidthUnits / (256 / 7));
|
||||
return $pixels;
|
||||
}
|
||||
|
||||
|
||||
protected static function _hex2str($hex) {
|
||||
protected static function _hex2str($hex)
|
||||
{
|
||||
return chr(hexdec($hex[1]));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Loads PHPExcel from file into PHPExcel instance
|
||||
*
|
||||
|
|
@ -321,7 +321,6 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
$timezoneObj = new DateTimeZone('Europe/London');
|
||||
$GMT = new DateTimeZone('UTC');
|
||||
|
||||
|
||||
// Check if file exists
|
||||
if (!file_exists($pFilename)) {
|
||||
throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
|
||||
|
|
@ -588,14 +587,13 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
|
||||
$columnID = 'A';
|
||||
foreach ($rowData->Cell as $cell) {
|
||||
|
||||
$cell_ss = $cell->attributes($namespaces['ss']);
|
||||
if (isset($cell_ss['Index'])) {
|
||||
$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
|
||||
}
|
||||
$cellRange = $columnID.$rowID;
|
||||
|
||||
if ($this->getReadFilter() !== NULL) {
|
||||
if ($this->getReadFilter() !== null) {
|
||||
if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -700,14 +698,22 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
foreach ($cellReferences as $cellReference) {
|
||||
$rowReference = $cellReference[2][0];
|
||||
// Empty R reference is the current row
|
||||
if ($rowReference == '') $rowReference = $rowID;
|
||||
if ($rowReference == '') {
|
||||
$rowReference = $rowID;
|
||||
}
|
||||
// Bracketed R references are relative to the current row
|
||||
if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
|
||||
if ($rowReference{0} == '[') {
|
||||
$rowReference = $rowID + trim($rowReference,'[]');
|
||||
}
|
||||
$columnReference = $cellReference[4][0];
|
||||
// Empty C reference is the current column
|
||||
if ($columnReference == '') $columnReference = $columnNumber;
|
||||
if ($columnReference == '') {
|
||||
$columnReference = $columnNumber;
|
||||
}
|
||||
// Bracketed C references are relative to the current column
|
||||
if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
|
||||
if ($columnReference{0} == '[') {
|
||||
$columnReference = $columnNumber + trim($columnReference,'[]');
|
||||
}
|
||||
$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
|
||||
$value = substr_replace($value, $A1CellReference, $cellReference[0][1],strlen($cellReference[0][0]));
|
||||
}
|
||||
|
|
@ -743,9 +749,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
// echo $annotation,'<br />';
|
||||
$annotation = strip_tags($node);
|
||||
// echo 'Annotation: ', $annotation,'<br />';
|
||||
$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
|
||||
->setAuthor(self::_convertStringEncoding($author , $this->_charSet))
|
||||
->setText($this->_parseRichText($annotation) );
|
||||
$objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::_convertStringEncoding($author , $this->_charSet))->setText($this->_parseRichText($annotation) );
|
||||
}
|
||||
|
||||
if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
|
||||
|
|
@ -756,7 +760,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
// print_r($this->_styles[$style]);
|
||||
// echo '<br />';
|
||||
if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
|
||||
$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
|
||||
$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
|
||||
}
|
||||
$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
|
||||
}
|
||||
|
|
@ -790,20 +794,21 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
|
|||
}
|
||||
|
||||
|
||||
protected static function _convertStringEncoding($string, $charset) {
|
||||
protected static function _convertStringEncoding($string, $charset)
|
||||
{
|
||||
if ($charset != 'UTF-8') {
|
||||
return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8', $charset);
|
||||
return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset);
|
||||
}
|
||||
return $string;
|
||||
}
|
||||
|
||||
|
||||
protected function _parseRichText($is = '') {
|
||||
protected function _parseRichText($is = '')
|
||||
{
|
||||
$value = new PHPExcel_RichText();
|
||||
|
||||
$value->createText(self::_convertStringEncoding($is, $this->_charSet));
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -436,9 +436,7 @@ class PHPExcel_ReferenceHelper
|
|||
$newCoordinates = PHPExcel_Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
|
||||
|
||||
// Should the cell be updated? Move value and cellXf index from one cell to another.
|
||||
if (($cellIndex >= $beforeColumnIndex) &&
|
||||
($cell->getRow() >= $beforeRow)) {
|
||||
|
||||
if (($cellIndex >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
|
||||
// Update cell styles
|
||||
$pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
|
||||
|
||||
|
|
@ -471,7 +469,6 @@ class PHPExcel_ReferenceHelper
|
|||
|
||||
if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
|
||||
for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
|
||||
|
||||
// Style
|
||||
$coordinate = PHPExcel_Cell::stringFromColumnIndex($beforeColumnIndex - 2) . $i;
|
||||
if ($pSheet->cellExists($coordinate)) {
|
||||
|
|
@ -495,7 +492,6 @@ class PHPExcel_ReferenceHelper
|
|||
|
||||
if ($pNumRows > 0 && $beforeRow - 1 > 0) {
|
||||
for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
|
||||
|
||||
// Style
|
||||
$coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . ($beforeRow - 1);
|
||||
if ($pSheet->cellExists($coordinate)) {
|
||||
|
|
@ -547,7 +543,7 @@ class PHPExcel_ReferenceHelper
|
|||
if ($pNumCols != 0) {
|
||||
$autoFilterColumns = array_keys($autoFilter->getColumns());
|
||||
if (count($autoFilterColumns) > 0) {
|
||||
sscanf($pBefore,'%[A-Z]%d', $column, $row);
|
||||
sscanf($pBefore, '%[A-Z]%d', $column, $row);
|
||||
$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
|
||||
list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
|
||||
if ($columnIndex <= $rangeEnd[0]) {
|
||||
|
|
@ -577,7 +573,7 @@ class PHPExcel_ReferenceHelper
|
|||
$toColRef = $rangeEnd[0]+$pNumCols;
|
||||
|
||||
do {
|
||||
$autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1),PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
|
||||
$autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1), PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
|
||||
--$endColRef;
|
||||
--$toColRef;
|
||||
} while ($startColRef <= $endColRef);
|
||||
|
|
@ -661,12 +657,12 @@ class PHPExcel_ReferenceHelper
|
|||
$modified4 = substr($this->updateCellReference('$A'.$match[4], $pBefore, $pNumCols, $pNumRows), 2);
|
||||
|
||||
if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
|
||||
if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
|
||||
if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
|
||||
$toString = ($match[2] > '') ? $match[2].'!' : '';
|
||||
$toString .= $modified3.':'.$modified4;
|
||||
// Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
|
||||
$column = 100000;
|
||||
$row = 10000000+trim($match[3],'$');
|
||||
$row = 10000000 + trim($match[3],'$');
|
||||
$cellIndex = $column.$row;
|
||||
|
||||
$newCellTokens[$cellIndex] = preg_quote($toString);
|
||||
|
|
@ -686,11 +682,11 @@ class PHPExcel_ReferenceHelper
|
|||
$modified4 = substr($this->updateCellReference($match[4].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
|
||||
|
||||
if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
|
||||
if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
|
||||
if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
|
||||
$toString = ($match[2] > '') ? $match[2].'!' : '';
|
||||
$toString .= $modified3.':'.$modified4;
|
||||
// Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($match[3],'$')) + 100000;
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($match[3], '$')) + 100000;
|
||||
$row = 10000000;
|
||||
$cellIndex = $column.$row;
|
||||
|
||||
|
|
@ -711,13 +707,13 @@ class PHPExcel_ReferenceHelper
|
|||
$modified4 = $this->updateCellReference($match[4], $pBefore, $pNumCols, $pNumRows);
|
||||
|
||||
if ($match[3].$match[4] !== $modified3.$modified4) {
|
||||
if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
|
||||
if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
|
||||
$toString = ($match[2] > '') ? $match[2].'!' : '';
|
||||
$toString .= $modified3.':'.$modified4;
|
||||
list($column, $row) = PHPExcel_Cell::coordinateFromString($match[3]);
|
||||
// Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
|
||||
$row = trim($row,'$') + 10000000;
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($column, '$')) + 100000;
|
||||
$row = trim($row, '$') + 10000000;
|
||||
$cellIndex = $column.$row;
|
||||
|
||||
$newCellTokens[$cellIndex] = preg_quote($toString);
|
||||
|
|
@ -737,13 +733,13 @@ class PHPExcel_ReferenceHelper
|
|||
|
||||
$modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
|
||||
if ($match[3] !== $modified3) {
|
||||
if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
|
||||
if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
|
||||
$toString = ($match[2] > '') ? $match[2].'!' : '';
|
||||
$toString .= $modified3;
|
||||
list($column, $row) = PHPExcel_Cell::coordinateFromString($match[3]);
|
||||
// Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
|
||||
$row = trim($row,'$') + 10000000;
|
||||
$column = PHPExcel_Cell::columnIndexFromString(trim($column, '$')) + 100000;
|
||||
$row = trim($row, '$') + 10000000;
|
||||
$cellIndex = $row . $column;
|
||||
|
||||
$newCellTokens[$cellIndex] = preg_quote($toString);
|
||||
|
|
@ -761,7 +757,7 @@ class PHPExcel_ReferenceHelper
|
|||
ksort($cellTokens);
|
||||
ksort($newCellTokens);
|
||||
} // Update cell references in the formula
|
||||
$formulaBlock = str_replace('\\','',preg_replace($cellTokens, $newCellTokens, $formulaBlock));
|
||||
$formulaBlock = str_replace('\\', '', preg_replace($cellTokens, $newCellTokens, $formulaBlock));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -839,7 +835,7 @@ class PHPExcel_ReferenceHelper
|
|||
*/
|
||||
private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
|
||||
{
|
||||
if (strpos($pCellRange,':') !== false || strpos($pCellRange, ',') !== false) {
|
||||
if (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
|
||||
// Update range
|
||||
$range = PHPExcel_Cell::splitRange($pCellRange);
|
||||
$ic = count($range);
|
||||
|
|
|
|||
|
|
@ -38,58 +38,155 @@ class PHPExcel_Shared_CodePage
|
|||
public static function NumberToName($codePage = 1252)
|
||||
{
|
||||
switch ($codePage) {
|
||||
case 367: return 'ASCII'; break; // ASCII
|
||||
case 437: return 'CP437'; break; // OEM US
|
||||
case 720: throw new PHPExcel_Exception('Code page 720 not supported.');
|
||||
case 367:
|
||||
return 'ASCII';
|
||||
break; // ASCII
|
||||
case 437:
|
||||
return 'CP437';
|
||||
break; // OEM US
|
||||
case 720:
|
||||
throw new PHPExcel_Exception('Code page 720 not supported.');
|
||||
break; // OEM Arabic
|
||||
case 737: return 'CP737'; break; // OEM Greek
|
||||
case 775: return 'CP775'; break; // OEM Baltic
|
||||
case 850: return 'CP850'; break; // OEM Latin I
|
||||
case 852: return 'CP852'; break; // OEM Latin II (Central European)
|
||||
case 855: return 'CP855'; break; // OEM Cyrillic
|
||||
case 857: return 'CP857'; break; // OEM Turkish
|
||||
case 858: return 'CP858'; break; // OEM Multilingual Latin I with Euro
|
||||
case 860: return 'CP860'; break; // OEM Portugese
|
||||
case 861: return 'CP861'; break; // OEM Icelandic
|
||||
case 862: return 'CP862'; break; // OEM Hebrew
|
||||
case 863: return 'CP863'; break; // OEM Canadian (French)
|
||||
case 864: return 'CP864'; break; // OEM Arabic
|
||||
case 865: return 'CP865'; break; // OEM Nordic
|
||||
case 866: return 'CP866'; break; // OEM Cyrillic (Russian)
|
||||
case 869: return 'CP869'; break; // OEM Greek (Modern)
|
||||
case 874: return 'CP874'; break; // ANSI Thai
|
||||
case 932: return 'CP932'; break; // ANSI Japanese Shift-JIS
|
||||
case 936: return 'CP936'; break; // ANSI Chinese Simplified GBK
|
||||
case 949: return 'CP949'; break; // ANSI Korean (Wansung)
|
||||
case 950: return 'CP950'; break; // ANSI Chinese Traditional BIG5
|
||||
case 1200: return 'UTF-16LE'; break; // UTF-16 (BIFF8)
|
||||
case 1250: return 'CP1250'; break; // ANSI Latin II (Central European)
|
||||
case 1251: return 'CP1251'; break; // ANSI Cyrillic
|
||||
case 0: // CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
|
||||
case 1252: return 'CP1252'; break; // ANSI Latin I (BIFF4-BIFF7)
|
||||
case 1253: return 'CP1253'; break; // ANSI Greek
|
||||
case 1254: return 'CP1254'; break; // ANSI Turkish
|
||||
case 1255: return 'CP1255'; break; // ANSI Hebrew
|
||||
case 1256: return 'CP1256'; break; // ANSI Arabic
|
||||
case 1257: return 'CP1257'; break; // ANSI Baltic
|
||||
case 1258: return 'CP1258'; break; // ANSI Vietnamese
|
||||
case 1361: return 'CP1361'; break; // ANSI Korean (Johab)
|
||||
case 10000: return 'MAC'; break; // Apple Roman
|
||||
case 10001: return 'CP932'; break; // Macintosh Japanese
|
||||
case 10002: return 'CP950'; break; // Macintosh Chinese Traditional
|
||||
case 10003: return 'CP1361'; break; // Macintosh Korean
|
||||
case 10006: return 'MACGREEK'; break; // Macintosh Greek
|
||||
case 10007: return 'MACCYRILLIC'; break; // Macintosh Cyrillic
|
||||
case 10008: return 'CP936'; break; // Macintosh - Simplified Chinese (GB 2312)
|
||||
case 10029: return 'MACCENTRALEUROPE'; break; // Macintosh Central Europe
|
||||
case 10079: return 'MACICELAND'; break; // Macintosh Icelandic
|
||||
case 10081: return 'MACTURKISH'; break; // Macintosh Turkish
|
||||
case 21010: return 'UTF-16LE'; break; // UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
|
||||
case 32768: return 'MAC'; break; // Apple Roman
|
||||
case 32769: throw new PHPExcel_Exception('Code page 32769 not supported.');
|
||||
case 737:
|
||||
return 'CP737';
|
||||
break; // OEM Greek
|
||||
case 775:
|
||||
return 'CP775';
|
||||
break; // OEM Baltic
|
||||
case 850:
|
||||
return 'CP850';
|
||||
break; // OEM Latin I
|
||||
case 852:
|
||||
return 'CP852';
|
||||
break; // OEM Latin II (Central European)
|
||||
case 855:
|
||||
return 'CP855';
|
||||
break; // OEM Cyrillic
|
||||
case 857:
|
||||
return 'CP857';
|
||||
break; // OEM Turkish
|
||||
case 858:
|
||||
return 'CP858';
|
||||
break; // OEM Multilingual Latin I with Euro
|
||||
case 860:
|
||||
return 'CP860';
|
||||
break; // OEM Portugese
|
||||
case 861:
|
||||
return 'CP861';
|
||||
break; // OEM Icelandic
|
||||
case 862:
|
||||
return 'CP862';
|
||||
break; // OEM Hebrew
|
||||
case 863:
|
||||
return 'CP863';
|
||||
break; // OEM Canadian (French)
|
||||
case 864:
|
||||
return 'CP864';
|
||||
break; // OEM Arabic
|
||||
case 865:
|
||||
return 'CP865';
|
||||
break; // OEM Nordic
|
||||
case 866:
|
||||
return 'CP866';
|
||||
break; // OEM Cyrillic (Russian)
|
||||
case 869:
|
||||
return 'CP869';
|
||||
break; // OEM Greek (Modern)
|
||||
case 874:
|
||||
return 'CP874';
|
||||
break; // ANSI Thai
|
||||
case 932:
|
||||
return 'CP932';
|
||||
break; // ANSI Japanese Shift-JIS
|
||||
case 936:
|
||||
return 'CP936';
|
||||
break; // ANSI Chinese Simplified GBK
|
||||
case 949:
|
||||
return 'CP949';
|
||||
break; // ANSI Korean (Wansung)
|
||||
case 950:
|
||||
return 'CP950';
|
||||
break; // ANSI Chinese Traditional BIG5
|
||||
case 1200:
|
||||
return 'UTF-16LE';
|
||||
break; // UTF-16 (BIFF8)
|
||||
case 1250:
|
||||
return 'CP1250';
|
||||
break; // ANSI Latin II (Central European)
|
||||
case 1251:
|
||||
return 'CP1251';
|
||||
break; // ANSI Cyrillic
|
||||
case 0:
|
||||
// CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
|
||||
case 1252:
|
||||
return 'CP1252';
|
||||
break; // ANSI Latin I (BIFF4-BIFF7)
|
||||
case 1253:
|
||||
return 'CP1253';
|
||||
break; // ANSI Greek
|
||||
case 1254:
|
||||
return 'CP1254';
|
||||
break; // ANSI Turkish
|
||||
case 1255:
|
||||
return 'CP1255';
|
||||
break; // ANSI Hebrew
|
||||
case 1256:
|
||||
return 'CP1256';
|
||||
break; // ANSI Arabic
|
||||
case 1257:
|
||||
return 'CP1257';
|
||||
break; // ANSI Baltic
|
||||
case 1258:
|
||||
return 'CP1258';
|
||||
break; // ANSI Vietnamese
|
||||
case 1361:
|
||||
return 'CP1361';
|
||||
break; // ANSI Korean (Johab)
|
||||
case 10000:
|
||||
return 'MAC';
|
||||
break; // Apple Roman
|
||||
case 10001:
|
||||
return 'CP932';
|
||||
break; // Macintosh Japanese
|
||||
case 10002:
|
||||
return 'CP950';
|
||||
break; // Macintosh Chinese Traditional
|
||||
case 10003:
|
||||
return 'CP1361';
|
||||
break; // Macintosh Korean
|
||||
case 10006:
|
||||
return 'MACGREEK';
|
||||
break; // Macintosh Greek
|
||||
case 10007:
|
||||
return 'MACCYRILLIC';
|
||||
break; // Macintosh Cyrillic
|
||||
case 10008:
|
||||
return 'CP936';
|
||||
break; // Macintosh - Simplified Chinese (GB 2312)
|
||||
case 10029:
|
||||
return 'MACCENTRALEUROPE';
|
||||
break; // Macintosh Central Europe
|
||||
case 10079:
|
||||
return 'MACICELAND';
|
||||
break; // Macintosh Icelandic
|
||||
case 10081:
|
||||
return 'MACTURKISH';
|
||||
break; // Macintosh Turkish
|
||||
case 21010:
|
||||
return 'UTF-16LE';
|
||||
break; // UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
|
||||
case 32768:
|
||||
return 'MAC';
|
||||
break; // Apple Roman
|
||||
case 32769:
|
||||
throw new PHPExcel_Exception('Code page 32769 not supported.');
|
||||
break; // ANSI Latin I (BIFF2-BIFF3)
|
||||
case 65000: return 'UTF-7'; break; // Unicode (UTF-7)
|
||||
case 65001: return 'UTF-8'; break; // Unicode (UTF-8)
|
||||
case 65000:
|
||||
return 'UTF-7';
|
||||
break; // Unicode (UTF-7)
|
||||
case 65001:
|
||||
return 'UTF-8';
|
||||
break; // Unicode (UTF-8)
|
||||
}
|
||||
throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,13 +184,9 @@ class PHPExcel_Shared_Date
|
|||
date_default_timezone_set('UTC');
|
||||
$retValue = false;
|
||||
if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
|
||||
$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
|
||||
$dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
|
||||
);
|
||||
$retValue = self::FormattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s'));
|
||||
} elseif (is_numeric($dateValue)) {
|
||||
$retValue = self::FormattedPHPToExcel( date('Y', $dateValue), date('m', $dateValue), date('d', $dateValue),
|
||||
date('H', $dateValue), date('i', $dateValue), date('s', $dateValue)
|
||||
);
|
||||
$retValue = self::FormattedPHPToExcel(date('Y', $dateValue), date('m', $dateValue), date('d', $dateValue), date('H', $dateValue), date('i', $dateValue), date('s', $dateValue));
|
||||
}
|
||||
date_default_timezone_set($saveTimeZone);
|
||||
|
||||
|
|
@ -235,8 +231,8 @@ class PHPExcel_Shared_Date
|
|||
}
|
||||
|
||||
// Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
|
||||
$century = substr($year,0,2);
|
||||
$decade = substr($year,2,2);
|
||||
$century = substr($year, 0, 2);
|
||||
$decade = substr($year, 2, 2);
|
||||
$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
|
||||
|
||||
$excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
|
||||
|
|
@ -283,12 +279,15 @@ class PHPExcel_Shared_Date
|
|||
*/
|
||||
public static function isDateTimeFormatCode($pFormatCode = '')
|
||||
{
|
||||
if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL))
|
||||
if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL)) {
|
||||
// "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
|
||||
return false;
|
||||
if (preg_match('/[0#]E[+-]0/i', $pFormatCode))
|
||||
}
|
||||
if (preg_match('/[0#]E[+-]0/i', $pFormatCode)) {
|
||||
// Scientific format
|
||||
return false;
|
||||
}
|
||||
|
||||
// Switch on formatcode
|
||||
switch ($pFormatCode) {
|
||||
// Explicitly defined date formats
|
||||
|
|
@ -352,10 +351,12 @@ class PHPExcel_Shared_Date
|
|||
*/
|
||||
public static function stringToExcel($dateValue = '')
|
||||
{
|
||||
if (strlen($dateValue) < 2)
|
||||
if (strlen($dateValue) < 2) {
|
||||
return false;
|
||||
if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
|
||||
}
|
||||
if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ class PHPExcel_Shared_Drawing
|
|||
|
||||
// Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
|
||||
// Calculate the next DWORD-position in the body
|
||||
for ($i = 0 ; $i < $body_size ; $i += 3) {
|
||||
for ($i = 0; $i < $body_size; $i += 3) {
|
||||
// Calculate line-ending and padding
|
||||
if ($x >= $width) {
|
||||
// If padding needed, ignore image-padding
|
||||
|
|
|
|||
|
|
@ -79,5 +79,4 @@ class PHPExcel_Shared_Escher_DgContainer
|
|||
{
|
||||
return $this->_spgrContainer = $spgrContainer;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,5 +61,4 @@ class PHPExcel_Shared_Escher_DggContainer_BstoreContainer
|
|||
{
|
||||
return $this->_BSECollection;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,5 +116,4 @@ class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
|
|||
{
|
||||
$this->_blipType = $blipType;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,5 +87,4 @@ class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
|
|||
{
|
||||
return $this->_parent;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,22 +51,17 @@ class PHPExcel_Shared_Excel5
|
|||
$columnDimensions = $sheet->getColumnDimensions();
|
||||
|
||||
// first find the true column width in pixels (uncollapsed and unhidden)
|
||||
if ( isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1 ) {
|
||||
|
||||
if (isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1) {
|
||||
// then we have column dimension with explicit width
|
||||
$columnDimension = $columnDimensions[$col];
|
||||
$width = $columnDimension->getWidth();
|
||||
$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
|
||||
|
||||
} else if ($sheet->getDefaultColumnDimension()->getWidth() != -1) {
|
||||
|
||||
// then we have default column dimension with explicit width
|
||||
$defaultColumnDimension = $sheet->getDefaultColumnDimension();
|
||||
$width = $defaultColumnDimension->getWidth();
|
||||
$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
|
||||
|
||||
} else {
|
||||
|
||||
// we don't even have any default column dimension. Width depends on default font
|
||||
$pixelWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($font, true);
|
||||
}
|
||||
|
|
@ -98,30 +93,24 @@ class PHPExcel_Shared_Excel5
|
|||
$rowDimensions = $sheet->getRowDimensions();
|
||||
|
||||
// first find the true row height in pixels (uncollapsed and unhidden)
|
||||
if ( isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
|
||||
|
||||
if (isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
|
||||
// then we have a row dimension
|
||||
$rowDimension = $rowDimensions[$row];
|
||||
$rowHeight = $rowDimension->getRowHeight();
|
||||
$pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
|
||||
|
||||
} else if ($sheet->getDefaultRowDimension()->getRowHeight() != -1) {
|
||||
|
||||
// then we have a default row dimension with explicit height
|
||||
$defaultRowDimension = $sheet->getDefaultRowDimension();
|
||||
$rowHeight = $defaultRowDimension->getRowHeight();
|
||||
$pixelRowHeight = PHPExcel_Shared_Drawing::pointsToPixels($rowHeight);
|
||||
|
||||
} else {
|
||||
|
||||
// we don't even have any default row dimension. Height depends on default font
|
||||
$pointRowHeight = PHPExcel_Shared_Font::getDefaultRowHeightByFont($font);
|
||||
$pixelRowHeight = PHPExcel_Shared_Font::fontSizeToPixels($pointRowHeight);
|
||||
|
||||
}
|
||||
|
||||
// now find the effective row height in pixels
|
||||
if ( isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible() ) {
|
||||
if (isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible()) {
|
||||
$effectivePixelRowHeight = 0;
|
||||
} else {
|
||||
$effectivePixelRowHeight = $pixelRowHeight;
|
||||
|
|
@ -313,5 +302,4 @@ class PHPExcel_Shared_Excel5
|
|||
|
||||
return $twoAnchor;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,18 +152,18 @@ class PHPExcel_Shared_File
|
|||
|
||||
// sys_get_temp_dir is only available since PHP 5.2.1
|
||||
// http://php.net/manual/en/function.sys-get-temp-dir.php#94119
|
||||
if ( !function_exists('sys_get_temp_dir')) {
|
||||
if ($temp = getenv('TMP') ) {
|
||||
if (!function_exists('sys_get_temp_dir')) {
|
||||
if ($temp = getenv('TMP')) {
|
||||
if ((!empty($temp)) && (file_exists($temp))) {
|
||||
return realpath($temp);
|
||||
}
|
||||
}
|
||||
if ($temp = getenv('TEMP') ) {
|
||||
if ($temp = getenv('TEMP')) {
|
||||
if ((!empty($temp)) && (file_exists($temp))) {
|
||||
return realpath($temp);
|
||||
}
|
||||
}
|
||||
if ($temp = getenv('TMPDIR') ) {
|
||||
if ($temp = getenv('TMPDIR')) {
|
||||
if ((!empty($temp)) && (file_exists($temp))) {
|
||||
return realpath($temp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -196,12 +196,12 @@ class PHPExcel_Shared_Font
|
|||
*/
|
||||
public static function setAutoSizeMethod($pValue = self::AUTOSIZE_METHOD_APPROX)
|
||||
{
|
||||
if (!in_array($pValue,self::$_autoSizeMethods)) {
|
||||
return FALSE;
|
||||
if (!in_array($pValue, self::$_autoSizeMethods)) {
|
||||
return false;
|
||||
}
|
||||
self::$autoSizeMethod = $pValue;
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -249,7 +249,8 @@ class PHPExcel_Shared_Font
|
|||
* @param PHPExcel_Style_Font|NULL $defaultFont Font object
|
||||
* @return integer Column width
|
||||
*/
|
||||
public static function calculateColumnWidth(PHPExcel_Style_Font $font, $cellText = '', $rotation = 0, PHPExcel_Style_Font $defaultFont = null) {
|
||||
public static function calculateColumnWidth(PHPExcel_Style_Font $font, $cellText = '', $rotation = 0, PHPExcel_Style_Font $defaultFont = null)
|
||||
{
|
||||
// If it is rich text, use plain text
|
||||
if ($cellText instanceof PHPExcel_RichText) {
|
||||
$cellText = $cellText->getPlainText();
|
||||
|
|
@ -301,7 +302,8 @@ class PHPExcel_Shared_Font
|
|||
* @return int
|
||||
* @throws PHPExcel_Exception
|
||||
*/
|
||||
public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) {
|
||||
public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0)
|
||||
{
|
||||
if (!function_exists('imagettfbbox')) {
|
||||
throw new PHPExcel_Exception('GD library needs to be enabled');
|
||||
}
|
||||
|
|
@ -391,7 +393,8 @@ class PHPExcel_Shared_Font
|
|||
* @param int $fontSizeInPoints Font size (in points)
|
||||
* @return int Font size (in pixels)
|
||||
*/
|
||||
public static function fontSizeToPixels($fontSizeInPoints = 11) {
|
||||
public static function fontSizeToPixels($fontSizeInPoints = 11)
|
||||
{
|
||||
return (int) ((4 / 3) * $fontSizeInPoints);
|
||||
}
|
||||
|
||||
|
|
@ -401,7 +404,8 @@ class PHPExcel_Shared_Font
|
|||
* @param int $sizeInInch Font size (in inch)
|
||||
* @return int Size (in pixels)
|
||||
*/
|
||||
public static function inchSizeToPixels($sizeInInch = 1) {
|
||||
public static function inchSizeToPixels($sizeInInch = 1)
|
||||
{
|
||||
return ($sizeInInch * 96);
|
||||
}
|
||||
|
||||
|
|
@ -411,7 +415,8 @@ class PHPExcel_Shared_Font
|
|||
* @param int $sizeInCm Font size (in centimeters)
|
||||
* @return int Size (in pixels)
|
||||
*/
|
||||
public static function centimeterSizeToPixels($sizeInCm = 1) {
|
||||
public static function centimeterSizeToPixels($sizeInCm = 1)
|
||||
{
|
||||
return ($sizeInCm * 37.795275591);
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +426,8 @@ class PHPExcel_Shared_Font
|
|||
* @param PHPExcel_Style_Font
|
||||
* @return string Path to TrueType font file
|
||||
*/
|
||||
public static function getTrueTypeFontFileFromFont($font) {
|
||||
public static function getTrueTypeFontFileFromFont($font)
|
||||
{
|
||||
if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
|
||||
throw new PHPExcel_Exception('Valid directory to TrueType Font files not specified');
|
||||
}
|
||||
|
|
@ -438,95 +444,79 @@ class PHPExcel_Shared_Font
|
|||
: ($italic ? self::ARIAL_ITALIC : self::ARIAL)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Calibri':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
|
||||
: ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Courier New':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
|
||||
: ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Comic Sans MS':
|
||||
$fontFile = (
|
||||
$bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Georgia':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
|
||||
: ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Impact':
|
||||
$fontFile = self::IMPACT;
|
||||
break;
|
||||
|
||||
case 'Liberation Sans':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
|
||||
: ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Lucida Console':
|
||||
$fontFile = self::LUCIDA_CONSOLE;
|
||||
break;
|
||||
|
||||
case 'Lucida Sans Unicode':
|
||||
$fontFile = self::LUCIDA_SANS_UNICODE;
|
||||
break;
|
||||
|
||||
case 'Microsoft Sans Serif':
|
||||
$fontFile = self::MICROSOFT_SANS_SERIF;
|
||||
break;
|
||||
|
||||
case 'Palatino Linotype':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
|
||||
: ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Symbol':
|
||||
$fontFile = self::SYMBOL;
|
||||
break;
|
||||
|
||||
case 'Tahoma':
|
||||
$fontFile = (
|
||||
$bold ? self::TAHOMA_BOLD : self::TAHOMA
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Times New Roman':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
|
||||
: ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Trebuchet MS':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
|
||||
: ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
|
||||
);
|
||||
break;
|
||||
|
||||
case 'Verdana':
|
||||
$fontFile = (
|
||||
$bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
|
||||
: ($italic ? self::VERDANA_ITALIC : self::VERDANA)
|
||||
);
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new PHPExcel_Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
|
||||
break;
|
||||
|
|
@ -536,7 +526,7 @@ class PHPExcel_Shared_Font
|
|||
|
||||
// Check if file actually exists
|
||||
if (!file_exists($fontFile)) {
|
||||
throw New PHPExcel_Exception('TrueType Font file not found');
|
||||
throw new PHPExcel_Exception('TrueType Font file not found');
|
||||
}
|
||||
|
||||
return $fontFile;
|
||||
|
|
@ -552,11 +542,16 @@ class PHPExcel_Shared_Font
|
|||
{
|
||||
switch ($name) {
|
||||
// Add more cases. Check FONT records in real Excel files.
|
||||
case 'EucrosiaUPC': return self::CHARSET_ANSI_THAI;
|
||||
case 'Wingdings': return self::CHARSET_SYMBOL;
|
||||
case 'Wingdings 2': return self::CHARSET_SYMBOL;
|
||||
case 'Wingdings 3': return self::CHARSET_SYMBOL;
|
||||
default: return self::CHARSET_ANSI_LATIN;
|
||||
case 'EucrosiaUPC':
|
||||
return self::CHARSET_ANSI_THAI;
|
||||
case 'Wingdings':
|
||||
return self::CHARSET_SYMBOL;
|
||||
case 'Wingdings 2':
|
||||
return self::CHARSET_SYMBOL;
|
||||
case 'Wingdings 3':
|
||||
return self::CHARSET_SYMBOL;
|
||||
default:
|
||||
return self::CHARSET_ANSI_LATIN;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -609,44 +604,36 @@ class PHPExcel_Shared_Font
|
|||
// inspection of Arial 10 workbook says 12.75pt ~17px
|
||||
$rowHeight = 12.75;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
// inspection of Arial 9 workbook says 12.00pt ~16px
|
||||
$rowHeight = 12;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
// inspection of Arial 8 workbook says 11.25pt ~15px
|
||||
$rowHeight = 11.25;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
// inspection of Arial 7 workbook says 9.00pt ~12px
|
||||
$rowHeight = 9;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
case 5:
|
||||
// inspection of Arial 5,6 workbook says 8.25pt ~11px
|
||||
$rowHeight = 8.25;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
// inspection of Arial 4 workbook says 6.75pt ~9px
|
||||
$rowHeight = 6.75;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
// inspection of Arial 3 workbook says 6.00pt ~8px
|
||||
$rowHeight = 6;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
case 1:
|
||||
// inspection of Arial 1,2 workbook says 5.25pt ~7px
|
||||
$rowHeight = 5.25;
|
||||
break;
|
||||
|
||||
default:
|
||||
// use Arial 10 workbook as an approximation, extrapolation
|
||||
$rowHeight = 12.75 * $font->getSize() / 10;
|
||||
|
|
@ -660,49 +647,40 @@ class PHPExcel_Shared_Font
|
|||
// inspection of Calibri 11 workbook says 15.00pt ~20px
|
||||
$rowHeight = 15;
|
||||
break;
|
||||
|
||||
case 10:
|
||||
// inspection of Calibri 10 workbook says 12.75pt ~17px
|
||||
$rowHeight = 12.75;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
// inspection of Calibri 9 workbook says 12.00pt ~16px
|
||||
$rowHeight = 12;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
// inspection of Calibri 8 workbook says 11.25pt ~15px
|
||||
$rowHeight = 11.25;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
// inspection of Calibri 7 workbook says 9.00pt ~12px
|
||||
$rowHeight = 9;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
case 5:
|
||||
// inspection of Calibri 5,6 workbook says 8.25pt ~11px
|
||||
$rowHeight = 8.25;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
// inspection of Calibri 4 workbook says 6.75pt ~9px
|
||||
$rowHeight = 6.75;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
// inspection of Calibri 3 workbook says 6.00pt ~8px
|
||||
$rowHeight = 6.00;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
case 1:
|
||||
// inspection of Calibri 1,2 workbook says 5.25pt ~7px
|
||||
$rowHeight = 5.25;
|
||||
break;
|
||||
|
||||
default:
|
||||
// use Calibri 11 workbook as an approximation, extrapolation
|
||||
$rowHeight = 15 * $font->getSize() / 11;
|
||||
|
|
@ -716,51 +694,42 @@ class PHPExcel_Shared_Font
|
|||
// inspection of Verdana 10 workbook says 12.75pt ~17px
|
||||
$rowHeight = 12.75;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
// inspection of Verdana 9 workbook says 11.25pt ~15px
|
||||
$rowHeight = 11.25;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
// inspection of Verdana 8 workbook says 10.50pt ~14px
|
||||
$rowHeight = 10.50;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
// inspection of Verdana 7 workbook says 9.00pt ~12px
|
||||
$rowHeight = 9.00;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
case 5:
|
||||
// inspection of Verdana 5,6 workbook says 8.25pt ~11px
|
||||
$rowHeight = 8.25;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
// inspection of Verdana 4 workbook says 6.75pt ~9px
|
||||
$rowHeight = 6.75;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
// inspection of Verdana 3 workbook says 6.00pt ~8px
|
||||
$rowHeight = 6;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
case 1:
|
||||
// inspection of Verdana 1,2 workbook says 5.25pt ~7px
|
||||
$rowHeight = 5.25;
|
||||
break;
|
||||
|
||||
default:
|
||||
// use Verdana 10 workbook as an approximation, extrapolation
|
||||
$rowHeight = 12.75 * $font->getSize() / 10;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
// just use Calibri as an approximation
|
||||
$rowHeight = 15 * $font->getSize() / 11;
|
||||
|
|
@ -769,5 +738,4 @@ class PHPExcel_Shared_Font
|
|||
|
||||
return $rowHeight;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,10 +73,7 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
|
|||
|
||||
// 25 is length of "ole-chainedblockstream://"
|
||||
parse_str(substr($path, 25), $this->params);
|
||||
if (!isset($this->params['oleInstanceId'],
|
||||
$this->params['blockId'],
|
||||
$GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
|
||||
|
||||
if (!isset($this->params['oleInstanceId'], $this->params['blockId'], $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
|
||||
if ($options & STREAM_REPORT_ERRORS) {
|
||||
trigger_error('OLE stream not found', E_USER_WARNING);
|
||||
}
|
||||
|
|
@ -86,10 +83,7 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
|
|||
|
||||
$blockId = $this->params['blockId'];
|
||||
$this->data = '';
|
||||
if (isset($this->params['size']) &&
|
||||
$this->params['size'] < $this->ole->bigBlockThreshold &&
|
||||
$blockId != $this->ole->root->_StartBlock) {
|
||||
|
||||
if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->_StartBlock) {
|
||||
// Block id refers to small blocks
|
||||
$rootPos = $this->ole->_getBlockOffset($this->ole->root->_StartBlock);
|
||||
while ($blockId != -2) {
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class PHPExcel_Shared_OLE_PPS
|
|||
*/
|
||||
public function _getPpsWk()
|
||||
{
|
||||
$ret = str_pad($this->Name,64,"\x00");
|
||||
$ret = str_pad($this->Name, 64, "\x00");
|
||||
|
||||
$ret .= pack("v", strlen($this->Name) + 2) // 66
|
||||
. pack("c", $this->Type) // 67
|
||||
|
|
@ -202,9 +202,9 @@ class PHPExcel_Shared_OLE_PPS
|
|||
*/
|
||||
public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
|
||||
{
|
||||
if ( !is_array($to_save) || (empty($to_save)) ) {
|
||||
if (!is_array($to_save) || (empty($to_save))) {
|
||||
return 0xFFFFFFFF;
|
||||
} elseif ( count($to_save) == 1 ) {
|
||||
} elseif (count($to_save) == 1) {
|
||||
$cnt = count($raList);
|
||||
// If the first entry, it's the root... Don't clone it!
|
||||
$raList[$cnt] = ( $depth == 0 ) ? $to_save[0] : clone $to_save[0];
|
||||
|
|
|
|||
|
|
@ -38,17 +38,7 @@ class PHPExcel_Shared_OLE_PPS_File extends PHPExcel_Shared_OLE_PPS
|
|||
*/
|
||||
public function __construct($name)
|
||||
{
|
||||
parent::__construct(
|
||||
null,
|
||||
$name,
|
||||
PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
'',
|
||||
array());
|
||||
parent::__construct(null, $name, PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE, null, null, null, null, null, '', array());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
|
|||
* Directory for temporary files
|
||||
* @var string
|
||||
*/
|
||||
protected $_tmp_dir = NULL;
|
||||
protected $_tmp_dir = null;
|
||||
|
||||
/**
|
||||
* @param integer $time_1st A timestamp
|
||||
|
|
@ -44,17 +44,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
|
|||
{
|
||||
$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
|
||||
|
||||
parent::__construct(
|
||||
null,
|
||||
PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'),
|
||||
PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
$time_1st,
|
||||
$time_2nd,
|
||||
null,
|
||||
$raChild);
|
||||
parent::__construct(null, PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'), PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT, null, null, null, $time_1st, $time_2nd, null, $raChild);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -83,7 +73,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
|
|||
if (is_resource($filename)) {
|
||||
$this->_FILEH_ = $filename;
|
||||
} else if ($filename == '-' || $filename == '') {
|
||||
if ($this->_tmp_dir === NULL)
|
||||
if ($this->_tmp_dir === null)
|
||||
$this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
|
||||
$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
|
||||
$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
|
||||
|
|
@ -451,7 +441,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
|
|||
if ($iBdCnt > $i1stBdL) {
|
||||
$iN=0;
|
||||
$iNb=0;
|
||||
for ($i = $i1stBdL;$i < $iBdCnt; $i++, ++$iN) {
|
||||
for ($i = $i1stBdL; $i < $iBdCnt; $i++, ++$iN) {
|
||||
if ($iN >= ($iBbCnt - 1)) {
|
||||
$iN = 0;
|
||||
++$iNb;
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class PHPExcel_Shared_OLERead {
|
|||
|
||||
// Get the file identifier
|
||||
// Don't bother reading the whole file until we know it's a valid OLE file
|
||||
$this->data = file_get_contents($sFileName, FALSE, NULL, 0, 8);
|
||||
$this->data = file_get_contents($sFileName, false, null, 0, 8);
|
||||
|
||||
// Check OLE identifier
|
||||
if ($this->data != self::IDENTIFIER_OLE) {
|
||||
|
|
@ -172,7 +172,7 @@ class PHPExcel_Shared_OLERead {
|
|||
*/
|
||||
public function getStream($stream)
|
||||
{
|
||||
if ($stream === NULL) {
|
||||
if ($stream === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -197,7 +197,9 @@ class PHPExcel_Shared_OLERead {
|
|||
++$numBlocks;
|
||||
}
|
||||
|
||||
if ($numBlocks == 0) return '';
|
||||
if ($numBlocks == 0) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$block = $this->props[$stream]['startBlock'];
|
||||
|
||||
|
|
@ -233,7 +235,8 @@ class PHPExcel_Shared_OLERead {
|
|||
/**
|
||||
* Read entries in the directory stream.
|
||||
*/
|
||||
private function _readPropertySets() {
|
||||
private function _readPropertySets()
|
||||
{
|
||||
$offset = 0;
|
||||
|
||||
// loop through entires, each entry is 128 bytes
|
||||
|
|
@ -254,14 +257,14 @@ class PHPExcel_Shared_OLERead {
|
|||
|
||||
$size = self::_GetInt4d($d, self::SIZE_POS);
|
||||
|
||||
$name = str_replace("\x00", "", substr($d,0, $nameSize));
|
||||
$name = str_replace("\x00", "", substr($d, 0, $nameSize));
|
||||
|
||||
|
||||
$this->props[] = array (
|
||||
$this->props[] = array(
|
||||
'name' => $name,
|
||||
'type' => $type,
|
||||
'startBlock' => $startBlock,
|
||||
'size' => $size);
|
||||
'size' => $size
|
||||
);
|
||||
|
||||
// tmp helper to simplify checks
|
||||
$upName = strtoupper($name);
|
||||
|
|
@ -269,8 +272,7 @@ class PHPExcel_Shared_OLERead {
|
|||
// Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
|
||||
if (($upName === 'WORKBOOK') || ($upName === 'BOOK')) {
|
||||
$this->wrkbook = count($this->props) - 1;
|
||||
}
|
||||
else if ( $upName === 'ROOT ENTRY' || $upName === 'R') {
|
||||
} else if ($upName === 'ROOT ENTRY' || $upName === 'R') {
|
||||
// Root entry
|
||||
$this->rootentry = count($this->props) - 1;
|
||||
}
|
||||
|
|
@ -289,7 +291,6 @@ class PHPExcel_Shared_OLERead {
|
|||
|
||||
$offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -313,5 +314,4 @@ class PHPExcel_Shared_OLERead {
|
|||
}
|
||||
return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -45,7 +45,8 @@ class PHPExcel_Shared_PasswordHasher
|
|||
* @param string $pPassword Password to hash
|
||||
* @return string Hashed password
|
||||
*/
|
||||
public static function hashPassword($pPassword = '') {
|
||||
public static function hashPassword($pPassword = '')
|
||||
{
|
||||
$password = 0x0000;
|
||||
$charPos = 1; // char position
|
||||
|
||||
|
|
|
|||
|
|
@ -93,10 +93,11 @@ class PHPExcel_Shared_String
|
|||
/**
|
||||
* Build control characters array
|
||||
*/
|
||||
private static function _buildControlCharacters() {
|
||||
private static function _buildControlCharacters()
|
||||
{
|
||||
for ($i = 0; $i <= 31; ++$i) {
|
||||
if ($i != 9 && $i != 10 && $i != 13) {
|
||||
$find = '_x' . sprintf('%04s' , strtoupper(dechex($i))) . '_';
|
||||
$find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
|
||||
$replace = chr($i);
|
||||
self::$_controlCharacters[$find] = $replace;
|
||||
}
|
||||
|
|
@ -316,10 +317,7 @@ class PHPExcel_Shared_String
|
|||
}
|
||||
|
||||
// CUSTOM: IBM AIX iconv() does not work
|
||||
if ( defined('PHP_OS') && @stristr(PHP_OS, 'AIX')
|
||||
&& defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0)
|
||||
&& defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0) )
|
||||
{
|
||||
if (defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
|
||||
self::$_isIconvEnabled = false;
|
||||
return false;
|
||||
}
|
||||
|
|
@ -329,7 +327,8 @@ class PHPExcel_Shared_String
|
|||
return true;
|
||||
}
|
||||
|
||||
public static function buildCharacterSets() {
|
||||
public static function buildCharacterSets()
|
||||
{
|
||||
if (empty(self::$_controlCharacters)) {
|
||||
self::_buildControlCharacters();
|
||||
}
|
||||
|
|
@ -352,8 +351,9 @@ class PHPExcel_Shared_String
|
|||
* @param string $value Value to unescape
|
||||
* @return string
|
||||
*/
|
||||
public static function ControlCharacterOOXML2PHP($value = '') {
|
||||
return str_replace( array_keys(self::$_controlCharacters), array_values(self::$_controlCharacters), $value );
|
||||
public static function ControlCharacterOOXML2PHP($value = '')
|
||||
{
|
||||
return str_replace(array_keys(self::$_controlCharacters), array_values(self::$_controlCharacters), $value);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -370,8 +370,9 @@ class PHPExcel_Shared_String
|
|||
* @param string $value Value to escape
|
||||
* @return string
|
||||
*/
|
||||
public static function ControlCharacterPHP2OOXML($value = '') {
|
||||
return str_replace( array_values(self::$_controlCharacters), array_keys(self::$_controlCharacters), $value );
|
||||
public static function ControlCharacterPHP2OOXML($value = '')
|
||||
{
|
||||
return str_replace(array_values(self::$_controlCharacters), array_keys(self::$_controlCharacters), $value);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -402,7 +403,8 @@ class PHPExcel_Shared_String
|
|||
* @param string $value
|
||||
* @return boolean
|
||||
*/
|
||||
public static function IsUTF8($value = '') {
|
||||
public static function IsUTF8($value = '')
|
||||
{
|
||||
return $value === '' || preg_match('/^./su', $value) === 1;
|
||||
}
|
||||
|
||||
|
|
@ -413,7 +415,8 @@ class PHPExcel_Shared_String
|
|||
* @param mixed $value
|
||||
* @return string
|
||||
*/
|
||||
public static function FormatNumber($value) {
|
||||
public static function FormatNumber($value)
|
||||
{
|
||||
if (is_float($value)) {
|
||||
return str_replace(',', '.', $value);
|
||||
}
|
||||
|
|
@ -523,17 +526,29 @@ class PHPExcel_Shared_String
|
|||
* @author Rasmus Andersson {@link http://rasmusandersson.se/}
|
||||
* @author vadik56
|
||||
*/
|
||||
public static function utf16_decode($str, $bom_be = TRUE) {
|
||||
if ( strlen($str) < 2 ) return $str;
|
||||
public static function utf16_decode($str, $bom_be = true)
|
||||
{
|
||||
if (strlen($str) < 2) {
|
||||
return $str;
|
||||
}
|
||||
$c0 = ord($str{0});
|
||||
$c1 = ord($str{1});
|
||||
if ( $c0 == 0xfe && $c1 == 0xff ) { $str = substr($str,2); }
|
||||
elseif ( $c0 == 0xff && $c1 == 0xfe ) { $str = substr($str,2); $bom_be = false; }
|
||||
if ($c0 == 0xfe && $c1 == 0xff) {
|
||||
$str = substr($str, 2);
|
||||
} elseif ($c0 == 0xff && $c1 == 0xfe) {
|
||||
$str = substr($str, 2);
|
||||
$bom_be = false;
|
||||
}
|
||||
$len = strlen($str);
|
||||
$newstr = '';
|
||||
for($i=0;$i<$len;$i+=2) {
|
||||
if ( $bom_be ) { $val = ord($str{$i}) << 4; $val += ord($str{$i+1}); }
|
||||
else { $val = ord($str{$i+1}) << 4; $val += ord($str{$i}); }
|
||||
for ($i=0; $i<$len; $i+=2) {
|
||||
if ($bom_be) {
|
||||
$val = ord($str{$i}) << 4;
|
||||
$val += ord($str{$i+1});
|
||||
} else {
|
||||
$val = ord($str{$i+1}) << 4;
|
||||
$val += ord($str{$i});
|
||||
}
|
||||
$newstr .= ($val == 0x228) ? "\n" : chr($val);
|
||||
}
|
||||
return $newstr;
|
||||
|
|
@ -634,7 +649,7 @@ class PHPExcel_Shared_String
|
|||
{
|
||||
# Split at all position not after the start: ^
|
||||
# and not before the end: $
|
||||
return preg_split('/(?<!^)(?!$)/u', $string );
|
||||
return preg_split('/(?<!^)(?!$)/u', $string);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -667,7 +682,8 @@ class PHPExcel_Shared_String
|
|||
* @param string &$operand string value to test
|
||||
* @return boolean
|
||||
*/
|
||||
public static function convertToNumberIfFraction(&$operand) {
|
||||
public static function convertToNumberIfFraction(&$operand)
|
||||
{
|
||||
if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
|
||||
$sign = ($match[1] == '-') ? '-' : '+';
|
||||
$fractionFormula = '='.$sign.$match[2].$sign.$match[3];
|
||||
|
|
@ -802,8 +818,9 @@ class PHPExcel_Shared_String
|
|||
*/
|
||||
public static function testStringAsNumeric($value)
|
||||
{
|
||||
if (is_numeric($value))
|
||||
if (is_numeric($value)) {
|
||||
return $value;
|
||||
}
|
||||
$v = floatval($value);
|
||||
return (is_numeric(substr($value, 0, strlen($v)))) ? $v : $value;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ class PHPExcel_Shared_TimeZone
|
|||
* @param string $timezone Time zone (e.g. 'Europe/London')
|
||||
* @return boolean Success or failure
|
||||
*/
|
||||
public static function _validateTimeZone($timezone) {
|
||||
public static function _validateTimeZone($timezone)
|
||||
{
|
||||
if (in_array($timezone, DateTimeZone::listIdentifiers())) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -63,7 +64,8 @@ class PHPExcel_Shared_TimeZone
|
|||
* @param string $timezone Time zone (e.g. 'Europe/London')
|
||||
* @return boolean Success or failure
|
||||
*/
|
||||
public static function setTimeZone($timezone) {
|
||||
public static function setTimeZone($timezone)
|
||||
{
|
||||
if (self::_validateTimezone($timezone)) {
|
||||
self::$_timezone = $timezone;
|
||||
return true;
|
||||
|
|
@ -77,7 +79,8 @@ class PHPExcel_Shared_TimeZone
|
|||
*
|
||||
* @return string Timezone (e.g. 'Europe/London')
|
||||
*/
|
||||
public static function getTimeZone() {
|
||||
public static function getTimeZone()
|
||||
{
|
||||
return self::$_timezone;
|
||||
} // function getTimezone()
|
||||
|
||||
|
|
@ -89,7 +92,8 @@ class PHPExcel_Shared_TimeZone
|
|||
* @param integer $timestamp PHP date/time value for finding the current transition
|
||||
* @return array The current transition details
|
||||
*/
|
||||
private static function _getTimezoneTransitions($objTimezone, $timestamp) {
|
||||
private static function _getTimezoneTransitions($objTimezone, $timestamp)
|
||||
{
|
||||
$allTransitions = $objTimezone->getTransitions();
|
||||
$transitions = array();
|
||||
foreach ($allTransitions as $key => $transition) {
|
||||
|
|
@ -114,7 +118,8 @@ class PHPExcel_Shared_TimeZone
|
|||
* @return integer Number of seconds for timezone adjustment
|
||||
* @throws PHPExcel_Exception
|
||||
*/
|
||||
public static function getTimeZoneAdjustment($timezone, $timestamp) {
|
||||
public static function getTimeZoneAdjustment($timezone, $timestamp)
|
||||
{
|
||||
if ($timezone !== null) {
|
||||
if (!self::_validateTimezone($timezone)) {
|
||||
throw new PHPExcel_Exception("Invalid timezone " . $timezone);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ if (!defined('DEBUGMODE_ENABLED')) {
|
|||
define('DEBUGMODE_ENABLED', false);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_Shared_XMLWriter
|
||||
*
|
||||
|
|
@ -41,7 +40,8 @@ if (!defined('DEBUGMODE_ENABLED')) {
|
|||
* @package PHPExcel_Shared
|
||||
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
*/
|
||||
class PHPExcel_Shared_XMLWriter extends XMLWriter {
|
||||
class PHPExcel_Shared_XMLWriter extends XMLWriter
|
||||
{
|
||||
/** Temporary storage method */
|
||||
const STORAGE_MEMORY = 1;
|
||||
const STORAGE_DISK = 2;
|
||||
|
|
@ -59,14 +59,16 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
|
|||
* @param int $pTemporaryStorage Temporary storage location
|
||||
* @param string $pTemporaryStorageFolder Temporary storage folder
|
||||
*/
|
||||
public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = NULL) {
|
||||
public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = null)
|
||||
{
|
||||
// Open temporary storage
|
||||
if ($pTemporaryStorage == self::STORAGE_MEMORY) {
|
||||
$this->openMemory();
|
||||
} else {
|
||||
// Create temporary filename
|
||||
if ($pTemporaryStorageFolder === NULL)
|
||||
if ($pTemporaryStorageFolder === null) {
|
||||
$pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
|
||||
}
|
||||
$this->_tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
|
||||
|
||||
// Open storage
|
||||
|
|
@ -85,7 +87,8 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
|
|||
/**
|
||||
* Destructor
|
||||
*/
|
||||
public function __destruct() {
|
||||
public function __destruct()
|
||||
{
|
||||
// Unlink temporary files
|
||||
if ($this->_tempFileName != '') {
|
||||
@unlink($this->_tempFileName);
|
||||
|
|
@ -97,7 +100,8 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
|
|||
*
|
||||
* @return $data
|
||||
*/
|
||||
public function getData() {
|
||||
public function getData()
|
||||
{
|
||||
if ($this->_tempFileName == '') {
|
||||
return $this->outputMemory(true);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -92,10 +92,7 @@ class PHPExcel_Shared_ZipArchive
|
|||
fwrite($handle, $contents);
|
||||
fclose($handle);
|
||||
|
||||
$res = $this->_zip->add($this->_tempDir.'/'.$filenameParts["basename"],
|
||||
PCLZIP_OPT_REMOVE_PATH, $this->_tempDir,
|
||||
PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]
|
||||
);
|
||||
$res = $this->_zip->add($this->_tempDir.'/'.$filenameParts["basename"], PCLZIP_OPT_REMOVE_PATH, $this->_tempDir, PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]);
|
||||
if ($res == 0) {
|
||||
throw new PHPExcel_Writer_Exception("Error zipping files : " . $this->_zip->errorInfo(true));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,11 +25,12 @@
|
|||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
class PHPExcel_Shared_ZipStreamWrapper {
|
||||
class PHPExcel_Shared_ZipStreamWrapper
|
||||
{
|
||||
/**
|
||||
* Internal ZipAcrhive
|
||||
*
|
||||
* @var ZipAcrhive
|
||||
* @var ZipArchive
|
||||
*/
|
||||
private $_archive;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_Best_Fit
|
||||
*
|
||||
|
|
@ -40,7 +39,7 @@ class PHPExcel_Best_Fit
|
|||
*
|
||||
* @var boolean
|
||||
**/
|
||||
protected $_error = False;
|
||||
protected $_error = false;
|
||||
|
||||
/**
|
||||
* Algorithm type to use for best-fit
|
||||
|
|
@ -75,7 +74,7 @@ class PHPExcel_Best_Fit
|
|||
*
|
||||
* @var boolean
|
||||
**/
|
||||
protected $_adjustToZero = False;
|
||||
protected $_adjustToZero = false;
|
||||
|
||||
/**
|
||||
* Y-value series of best-fit values
|
||||
|
|
@ -113,205 +112,207 @@ class PHPExcel_Best_Fit
|
|||
protected $_Yoffset = 0;
|
||||
|
||||
|
||||
public function getError() {
|
||||
public function getError()
|
||||
{
|
||||
return $this->_error;
|
||||
} // function getBestFitType()
|
||||
|
||||
|
||||
public function getBestFitType() {
|
||||
public function getBestFitType()
|
||||
{
|
||||
return $this->_bestFitType;
|
||||
} // function getBestFitType()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Y-Value for a specified value of X
|
||||
*
|
||||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
*/
|
||||
public function getValueOfYForX($xValue) {
|
||||
return False;
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
return false;
|
||||
} // function getValueOfYForX()
|
||||
|
||||
|
||||
/**
|
||||
* Return the X-Value for a specified value of Y
|
||||
*
|
||||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
*/
|
||||
public function getValueOfXForY($yValue) {
|
||||
return False;
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return false;
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
||||
/**
|
||||
* Return the original set of X-Values
|
||||
*
|
||||
* @return float[] X-Values
|
||||
*/
|
||||
public function getXValues() {
|
||||
public function getXValues()
|
||||
{
|
||||
return $this->_xValues;
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Equation of the best-fit line
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
*/
|
||||
public function getEquation($dp=0) {
|
||||
return False;
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
return false;
|
||||
} // function getEquation()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Slope of the line
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
*/
|
||||
public function getSlope($dp=0) {
|
||||
public function getSlope($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_slope, $dp);
|
||||
}
|
||||
return $this->_slope;
|
||||
} // function getSlope()
|
||||
|
||||
|
||||
/**
|
||||
* Return the standard error of the Slope
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
*/
|
||||
public function getSlopeSE($dp=0) {
|
||||
public function getSlopeSE($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_slopeSE, $dp);
|
||||
}
|
||||
return $this->_slopeSE;
|
||||
} // function getSlopeSE()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Value of X where it intersects Y = 0
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
*/
|
||||
public function getIntersect($dp=0) {
|
||||
public function getIntersect($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_intersect, $dp);
|
||||
}
|
||||
return $this->_intersect;
|
||||
} // function getIntersect()
|
||||
|
||||
|
||||
/**
|
||||
* Return the standard error of the Intersect
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
*/
|
||||
public function getIntersectSE($dp=0) {
|
||||
public function getIntersectSE($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_intersectSE, $dp);
|
||||
}
|
||||
return $this->_intersectSE;
|
||||
} // function getIntersectSE()
|
||||
|
||||
|
||||
/**
|
||||
* Return the goodness of fit for this regression
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to return
|
||||
* @return float
|
||||
*/
|
||||
public function getGoodnessOfFit($dp=0) {
|
||||
public function getGoodnessOfFit($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_goodnessOfFit, $dp);
|
||||
}
|
||||
return $this->_goodnessOfFit;
|
||||
} // function getGoodnessOfFit()
|
||||
|
||||
|
||||
public function getGoodnessOfFitPercent($dp=0) {
|
||||
public function getGoodnessOfFitPercent($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_goodnessOfFit * 100, $dp);
|
||||
}
|
||||
return $this->_goodnessOfFit * 100;
|
||||
} // function getGoodnessOfFitPercent()
|
||||
|
||||
|
||||
/**
|
||||
* Return the standard deviation of the residuals for this regression
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to return
|
||||
* @return float
|
||||
*/
|
||||
public function getStdevOfResiduals($dp=0) {
|
||||
public function getStdevOfResiduals($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_stdevOfResiduals, $dp);
|
||||
}
|
||||
return $this->_stdevOfResiduals;
|
||||
} // function getStdevOfResiduals()
|
||||
|
||||
|
||||
public function getSSRegression($dp=0) {
|
||||
public function getSSRegression($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_SSRegression, $dp);
|
||||
}
|
||||
return $this->_SSRegression;
|
||||
} // function getSSRegression()
|
||||
|
||||
|
||||
public function getSSResiduals($dp=0) {
|
||||
public function getSSResiduals($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_SSResiduals, $dp);
|
||||
}
|
||||
return $this->_SSResiduals;
|
||||
} // function getSSResiduals()
|
||||
|
||||
|
||||
public function getDFResiduals($dp=0) {
|
||||
public function getDFResiduals($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_DFResiduals, $dp);
|
||||
}
|
||||
return $this->_DFResiduals;
|
||||
} // function getDFResiduals()
|
||||
|
||||
|
||||
public function getF($dp=0) {
|
||||
public function getF($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_F, $dp);
|
||||
}
|
||||
return $this->_F;
|
||||
} // function getF()
|
||||
|
||||
|
||||
public function getCovariance($dp=0) {
|
||||
public function getCovariance($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_covariance, $dp);
|
||||
}
|
||||
return $this->_covariance;
|
||||
} // function getCovariance()
|
||||
|
||||
|
||||
public function getCorrelation($dp=0) {
|
||||
public function getCorrelation($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round($this->_correlation, $dp);
|
||||
}
|
||||
return $this->_correlation;
|
||||
} // function getCorrelation()
|
||||
|
||||
|
||||
public function getYBestFitValues() {
|
||||
public function getYBestFitValues()
|
||||
{
|
||||
return $this->_yBestFitValues;
|
||||
} // function getYBestFitValues()
|
||||
|
||||
|
||||
protected function _calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const) {
|
||||
protected function _calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const)
|
||||
{
|
||||
$SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
|
||||
foreach ($this->_xValues as $xKey => $xValue) {
|
||||
$bestFitY = $this->_yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
|
||||
|
|
@ -346,7 +347,7 @@ class PHPExcel_Best_Fit
|
|||
|
||||
$this->_SSRegression = $this->_goodnessOfFit * $SStot;
|
||||
$this->_covariance = $SScov / $this->_valueCount;
|
||||
$this->_correlation = ($this->_valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->_valueCount * $sumX2 - pow($sumX,2)) * ($this->_valueCount * $sumY2 - pow($sumY,2)));
|
||||
$this->_correlation = ($this->_valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->_valueCount * $sumX2 - pow($sumX, 2)) * ($this->_valueCount * $sumY2 - pow($sumY, 2)));
|
||||
$this->_slopeSE = $this->_stdevOfResiduals / sqrt($SSsex);
|
||||
$this->_intersectSE = $this->_stdevOfResiduals * sqrt(1 / ($this->_valueCount - ($sumX * $sumX) / $sumX2));
|
||||
if ($this->_SSResiduals != 0.0) {
|
||||
|
|
@ -364,15 +365,15 @@ class PHPExcel_Best_Fit
|
|||
}
|
||||
} // function _calculateGoodnessOfFit()
|
||||
|
||||
|
||||
protected function _leastSquareFit($yValues, $xValues, $const) {
|
||||
protected function _leastSquareFit($yValues, $xValues, $const)
|
||||
{
|
||||
// calculate sums
|
||||
$x_sum = array_sum($xValues);
|
||||
$y_sum = array_sum($yValues);
|
||||
$meanX = $x_sum / $this->_valueCount;
|
||||
$meanY = $y_sum / $this->_valueCount;
|
||||
$mBase = $mDivisor = $xx_sum = $xy_sum = $yy_sum = 0.0;
|
||||
for($i = 0; $i < $this->_valueCount; ++$i) {
|
||||
for ($i = 0; $i < $this->_valueCount; ++$i) {
|
||||
$xy_sum += $xValues[$i] * $yValues[$i];
|
||||
$xx_sum += $xValues[$i] * $xValues[$i];
|
||||
$yy_sum += $yValues[$i] * $yValues[$i];
|
||||
|
|
@ -401,7 +402,6 @@ class PHPExcel_Best_Fit
|
|||
$this->_calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, $meanX, $meanY, $const);
|
||||
} // function _leastSquareFit()
|
||||
|
||||
|
||||
/**
|
||||
* Define the regression
|
||||
*
|
||||
|
|
@ -409,7 +409,8 @@ class PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($yValues, $xValues=array(), $const=True) {
|
||||
public function __construct($yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
// Calculate number of points
|
||||
$nY = count($yValues);
|
||||
$nX = count($xValues);
|
||||
|
|
@ -420,13 +421,12 @@ class PHPExcel_Best_Fit
|
|||
$nX = $nY;
|
||||
} elseif ($nY != $nX) {
|
||||
// Ensure both arrays of points are the same size
|
||||
$this->_error = True;
|
||||
return False;
|
||||
$this->_error = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
$this->_valueCount = $nY;
|
||||
$this->_xValues = $xValues;
|
||||
$this->_yValues = $yValues;
|
||||
} // function __construct()
|
||||
|
||||
} // class bestFit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,71 +46,70 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
|
|||
**/
|
||||
protected $_bestFitType = 'exponential';
|
||||
|
||||
|
||||
/**
|
||||
* Return the Y-Value for a specified value of X
|
||||
*
|
||||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
**/
|
||||
public function getValueOfYForX($xValue) {
|
||||
return $this->getIntersect() * pow($this->getSlope(),($xValue - $this->_Xoffset));
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
return $this->getIntersect() * pow($this->getSlope(), ($xValue - $this->_Xoffset));
|
||||
} // function getValueOfYForX()
|
||||
|
||||
|
||||
/**
|
||||
* Return the X-Value for a specified value of Y
|
||||
*
|
||||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
**/
|
||||
public function getValueOfXForY($yValue) {
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return log(($yValue + $this->_Yoffset) / $this->getIntersect()) / log($this->getSlope());
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Equation of the best-fit line
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getEquation($dp=0) {
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
$slope = $this->getSlope($dp);
|
||||
$intersect = $this->getIntersect($dp);
|
||||
|
||||
return 'Y = '.$intersect.' * '.$slope.'^X';
|
||||
} // function getEquation()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Slope of the line
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getSlope($dp=0) {
|
||||
public function getSlope($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round(exp($this->_slope), $dp);
|
||||
}
|
||||
return exp($this->_slope);
|
||||
} // function getSlope()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Value of X where it intersects Y = 0
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getIntersect($dp=0) {
|
||||
public function getIntersect($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round(exp($this->_intersect), $dp);
|
||||
}
|
||||
return exp($this->_intersect);
|
||||
} // function getIntersect()
|
||||
|
||||
|
||||
/**
|
||||
* Execute the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -118,7 +117,8 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
private function _exponential_regression($yValues, $xValues, $const) {
|
||||
private function _exponential_regression($yValues, $xValues, $const)
|
||||
{
|
||||
foreach ($yValues as &$value) {
|
||||
if ($value < 0.0) {
|
||||
$value = 0 - log(abs($value));
|
||||
|
|
@ -131,7 +131,6 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
|
|||
$this->_leastSquareFit($yValues, $xValues, $const);
|
||||
} // function _exponential_regression()
|
||||
|
||||
|
||||
/**
|
||||
* Define the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -139,10 +138,10 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($yValues, $xValues=array(), $const=True) {
|
||||
if (parent::__construct($yValues, $xValues) !== False) {
|
||||
function __construct($yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
if (parent::__construct($yValues, $xValues) !== false) {
|
||||
$this->_exponential_regression($yValues, $xValues, $const);
|
||||
}
|
||||
} // function __construct()
|
||||
|
||||
} // class exponentialBestFit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,10 +25,8 @@
|
|||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
|
||||
|
||||
require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_Linear_Best_Fit
|
||||
*
|
||||
|
|
@ -46,25 +44,25 @@ class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
|
|||
**/
|
||||
protected $_bestFitType = 'linear';
|
||||
|
||||
|
||||
/**
|
||||
* Return the Y-Value for a specified value of X
|
||||
*
|
||||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
**/
|
||||
public function getValueOfYForX($xValue) {
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
return $this->getIntersect() + $this->getSlope() * $xValue;
|
||||
} // function getValueOfYForX()
|
||||
|
||||
|
||||
/**
|
||||
* Return the X-Value for a specified value of Y
|
||||
*
|
||||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
**/
|
||||
public function getValueOfXForY($yValue) {
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return ($yValue - $this->getIntersect()) / $this->getSlope();
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
|
@ -75,14 +73,14 @@ class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getEquation($dp=0) {
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
$slope = $this->getSlope($dp);
|
||||
$intersect = $this->getIntersect($dp);
|
||||
|
||||
return 'Y = '.$intersect.' + '.$slope.' * X';
|
||||
} // function getEquation()
|
||||
|
||||
|
||||
/**
|
||||
* Execute the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -90,11 +88,11 @@ class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
private function _linear_regression($yValues, $xValues, $const) {
|
||||
private function _linear_regression($yValues, $xValues, $const)
|
||||
{
|
||||
$this->_leastSquareFit($yValues, $xValues, $const);
|
||||
} // function _linear_regression()
|
||||
|
||||
|
||||
/**
|
||||
* Define the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -102,10 +100,10 @@ class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($yValues, $xValues=array(), $const=True) {
|
||||
if (parent::__construct($yValues, $xValues) !== False) {
|
||||
function __construct($yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
if (parent::__construct($yValues, $xValues) !== false) {
|
||||
$this->_linear_regression($yValues, $xValues, $const);
|
||||
}
|
||||
} // function __construct()
|
||||
|
||||
} // class linearBestFit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,10 +25,8 @@
|
|||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
|
||||
|
||||
require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_Logarithmic_Best_Fit
|
||||
*
|
||||
|
|
@ -46,43 +44,42 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
|
|||
**/
|
||||
protected $_bestFitType = 'logarithmic';
|
||||
|
||||
|
||||
/**
|
||||
* Return the Y-Value for a specified value of X
|
||||
*
|
||||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
**/
|
||||
public function getValueOfYForX($xValue) {
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
return $this->getIntersect() + $this->getSlope() * log($xValue - $this->_Xoffset);
|
||||
} // function getValueOfYForX()
|
||||
|
||||
|
||||
/**
|
||||
* Return the X-Value for a specified value of Y
|
||||
*
|
||||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
**/
|
||||
public function getValueOfXForY($yValue) {
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return exp(($yValue - $this->getIntersect()) / $this->getSlope());
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
||||
/**
|
||||
* Return the Equation of the best-fit line
|
||||
*
|
||||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getEquation($dp=0) {
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
$slope = $this->getSlope($dp);
|
||||
$intersect = $this->getIntersect($dp);
|
||||
|
||||
return 'Y = '.$intersect.' + '.$slope.' * log(X)';
|
||||
} // function getEquation()
|
||||
|
||||
|
||||
/**
|
||||
* Execute the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -90,7 +87,8 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
private function _logarithmic_regression($yValues, $xValues, $const) {
|
||||
private function _logarithmic_regression($yValues, $xValues, $const)
|
||||
{
|
||||
foreach ($xValues as &$value) {
|
||||
if ($value < 0.0) {
|
||||
$value = 0 - log(abs($value));
|
||||
|
|
@ -103,7 +101,6 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
|
|||
$this->_leastSquareFit($yValues, $xValues, $const);
|
||||
} // function _logarithmic_regression()
|
||||
|
||||
|
||||
/**
|
||||
* Define the regression and calculate the goodness of fit for a set of X and Y data values
|
||||
*
|
||||
|
|
@ -111,10 +108,10 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($yValues, $xValues=array(), $const=True) {
|
||||
if (parent::__construct($yValues, $xValues) !== False) {
|
||||
function __construct($yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
if (parent::__construct($yValues, $xValues) !== false) {
|
||||
$this->_logarithmic_regression($yValues, $xValues, $const);
|
||||
}
|
||||
} // function __construct()
|
||||
|
||||
} // class logarithmicBestFit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
*
|
||||
* @return int
|
||||
**/
|
||||
public function getOrder() {
|
||||
public function getOrder()
|
||||
{
|
||||
return $this->_order;
|
||||
} // function getOrder()
|
||||
|
||||
|
|
@ -72,7 +73,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
**/
|
||||
public function getValueOfYForX($xValue) {
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
$retVal = $this->getIntersect();
|
||||
$slope = $this->getSlope();
|
||||
foreach ($slope as $key => $value) {
|
||||
|
|
@ -90,7 +92,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
**/
|
||||
public function getValueOfXForY($yValue) {
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return ($yValue - $this->getIntersect()) / $this->getSlope();
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
|
@ -101,7 +104,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getEquation($dp=0) {
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
$slope = $this->getSlope($dp);
|
||||
$intersect = $this->getIntersect($dp);
|
||||
|
||||
|
|
@ -124,7 +128,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getSlope($dp=0) {
|
||||
public function getSlope($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
$coefficients = array();
|
||||
foreach ($this->_slope as $coefficient) {
|
||||
|
|
@ -136,7 +141,8 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
} // function getSlope()
|
||||
|
||||
|
||||
public function getCoefficients($dp=0) {
|
||||
public function getCoefficients($dp = 0)
|
||||
{
|
||||
return array_merge(array($this->getIntersect($dp)), $this->getSlope($dp));
|
||||
} // function getCoefficients()
|
||||
|
||||
|
|
@ -149,12 +155,13 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
private function _polynomial_regression($order, $yValues, $xValues, $const) {
|
||||
private function _polynomial_regression($order, $yValues, $xValues, $const)
|
||||
{
|
||||
// calculate sums
|
||||
$x_sum = array_sum($xValues);
|
||||
$y_sum = array_sum($yValues);
|
||||
$xx_sum = $xy_sum = 0;
|
||||
for($i = 0; $i < $this->_valueCount; ++$i) {
|
||||
for ($i = 0; $i < $this->_valueCount; ++$i) {
|
||||
$xy_sum += $xValues[$i] * $yValues[$i];
|
||||
$xx_sum += $xValues[$i] * $xValues[$i];
|
||||
$yy_sum += $yValues[$i] * $yValues[$i];
|
||||
|
|
@ -180,7 +187,7 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
$C = $matrixA->solve($matrixB);
|
||||
|
||||
$coefficients = array();
|
||||
for($i = 0; $i < $C->m; ++$i) {
|
||||
for ($i = 0; $i < $C->m; ++$i) {
|
||||
$r = $C->get($i, 0);
|
||||
if (abs($r) <= pow(10, -9)) {
|
||||
$r = 0;
|
||||
|
|
@ -206,19 +213,19 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($order, $yValues, $xValues=array(), $const=True) {
|
||||
if (parent::__construct($yValues, $xValues) !== False) {
|
||||
function __construct($order, $yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
if (parent::__construct($yValues, $xValues) !== false) {
|
||||
if ($order < $this->_valueCount) {
|
||||
$this->_bestFitType .= '_'.$order;
|
||||
$this->_order = $order;
|
||||
$this->_polynomial_regression($order, $yValues, $xValues, $const);
|
||||
if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {
|
||||
$this->_error = True;
|
||||
$this->_error = true;
|
||||
}
|
||||
} else {
|
||||
$this->_error = True;
|
||||
$this->_error = true;
|
||||
}
|
||||
}
|
||||
} // function __construct()
|
||||
|
||||
} // class polynomialBestFit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,8 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float $xValue X-Value
|
||||
* @return float Y-Value
|
||||
**/
|
||||
public function getValueOfYForX($xValue) {
|
||||
public function getValueOfYForX($xValue)
|
||||
{
|
||||
return $this->getIntersect() * pow(($xValue - $this->_Xoffset), $this->getSlope());
|
||||
} // function getValueOfYForX()
|
||||
|
||||
|
|
@ -64,8 +65,9 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float $yValue Y-Value
|
||||
* @return float X-Value
|
||||
**/
|
||||
public function getValueOfXForY($yValue) {
|
||||
return pow((($yValue + $this->_Yoffset) / $this->getIntersect()),(1 / $this->getSlope()));
|
||||
public function getValueOfXForY($yValue)
|
||||
{
|
||||
return pow((($yValue + $this->_Yoffset) / $this->getIntersect()), (1 / $this->getSlope()));
|
||||
} // function getValueOfXForY()
|
||||
|
||||
|
||||
|
|
@ -75,7 +77,8 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getEquation($dp=0) {
|
||||
public function getEquation($dp = 0)
|
||||
{
|
||||
$slope = $this->getSlope($dp);
|
||||
$intersect = $this->getIntersect($dp);
|
||||
|
||||
|
|
@ -89,7 +92,8 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param int $dp Number of places of decimal precision to display
|
||||
* @return string
|
||||
**/
|
||||
public function getIntersect($dp=0) {
|
||||
public function getIntersect($dp = 0)
|
||||
{
|
||||
if ($dp != 0) {
|
||||
return round(exp($this->_intersect), $dp);
|
||||
}
|
||||
|
|
@ -104,7 +108,8 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
private function _power_regression($yValues, $xValues, $const) {
|
||||
private function _power_regression($yValues, $xValues, $const)
|
||||
{
|
||||
foreach ($xValues as &$value) {
|
||||
if ($value < 0.0) {
|
||||
$value = 0 - log(abs($value));
|
||||
|
|
@ -133,10 +138,10 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
|
|||
* @param float[] $xValues The set of X-values for this regression
|
||||
* @param boolean $const
|
||||
*/
|
||||
function __construct($yValues, $xValues=array(), $const=True) {
|
||||
if (parent::__construct($yValues, $xValues) !== False) {
|
||||
function __construct($yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
if (parent::__construct($yValues, $xValues) !== false) {
|
||||
$this->_power_regression($yValues, $xValues, $const);
|
||||
}
|
||||
} // function __construct()
|
||||
|
||||
} // class powerBestFit
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,7 +84,8 @@ class trendClass
|
|||
private static $_trendCache = array();
|
||||
|
||||
|
||||
public static function calculate($trendType=self::TREND_BEST_FIT, $yValues, $xValues=array(), $const=True) {
|
||||
public static function calculate($trendType = self::TREND_BEST_FIT, $yValues, $xValues = array(), $const = true)
|
||||
{
|
||||
// Calculate number of points in each dataset
|
||||
$nY = count($yValues);
|
||||
$nX = count($xValues);
|
||||
|
|
@ -102,29 +103,29 @@ class trendClass
|
|||
// Determine which trend method has been requested
|
||||
switch ($trendType) {
|
||||
// Instantiate and return the class for the requested trend method
|
||||
case self::TREND_LINEAR :
|
||||
case self::TREND_LOGARITHMIC :
|
||||
case self::TREND_EXPONENTIAL :
|
||||
case self::TREND_POWER :
|
||||
case self::TREND_LINEAR:
|
||||
case self::TREND_LOGARITHMIC:
|
||||
case self::TREND_EXPONENTIAL:
|
||||
case self::TREND_POWER:
|
||||
if (!isset(self::$_trendCache[$key])) {
|
||||
$className = 'PHPExcel_'.$trendType.'_Best_Fit';
|
||||
self::$_trendCache[$key] = new $className($yValues, $xValues, $const);
|
||||
}
|
||||
return self::$_trendCache[$key];
|
||||
break;
|
||||
case self::TREND_POLYNOMIAL_2 :
|
||||
case self::TREND_POLYNOMIAL_3 :
|
||||
case self::TREND_POLYNOMIAL_4 :
|
||||
case self::TREND_POLYNOMIAL_5 :
|
||||
case self::TREND_POLYNOMIAL_6 :
|
||||
case self::TREND_POLYNOMIAL_2:
|
||||
case self::TREND_POLYNOMIAL_3:
|
||||
case self::TREND_POLYNOMIAL_4:
|
||||
case self::TREND_POLYNOMIAL_5:
|
||||
case self::TREND_POLYNOMIAL_6:
|
||||
if (!isset(self::$_trendCache[$key])) {
|
||||
$order = substr($trendType,-1);
|
||||
$order = substr($trendType, -1);
|
||||
self::$_trendCache[$key] = new PHPExcel_Polynomial_Best_Fit($order, $yValues, $xValues, $const);
|
||||
}
|
||||
return self::$_trendCache[$key];
|
||||
break;
|
||||
case self::TREND_BEST_FIT :
|
||||
case self::TREND_BEST_FIT_NO_POLY :
|
||||
case self::TREND_BEST_FIT:
|
||||
case self::TREND_BEST_FIT_NO_POLY:
|
||||
// If the request is to determine the best fit regression, then we test each trend line in turn
|
||||
// Start by generating an instance of each available trend method
|
||||
foreach (self::$_trendTypes as $trendMethod) {
|
||||
|
|
@ -134,7 +135,7 @@ class trendClass
|
|||
}
|
||||
if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
|
||||
foreach (self::$_trendTypePolyOrders as $trendMethod) {
|
||||
$order = substr($trendMethod,-1);
|
||||
$order = substr($trendMethod, -1);
|
||||
$bestFit[$trendMethod] = new PHPExcel_Polynomial_Best_Fit($order, $yValues, $xValues, $const);
|
||||
if ($bestFit[$trendMethod]->getError()) {
|
||||
unset($bestFit[$trendMethod]);
|
||||
|
|
@ -148,9 +149,8 @@ class trendClass
|
|||
$bestFitType = key($bestFitValue);
|
||||
return $bestFit[$bestFitType];
|
||||
break;
|
||||
default :
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
} // function calculate()
|
||||
|
||||
} // class trendClass
|
||||
|
|
@ -196,7 +196,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @var PHPExcel_Worksheet_AutoFilter
|
||||
*/
|
||||
private $_autoFilter = NULL;
|
||||
private $_autoFilter = null;
|
||||
|
||||
/**
|
||||
* Freeze pane
|
||||
|
|
@ -334,7 +334,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
{
|
||||
// Set parent and title
|
||||
$this->_parent = $pParent;
|
||||
$this->setTitle($pTitle, FALSE);
|
||||
$this->setTitle($pTitle, false);
|
||||
// setTitle can change $pTitle
|
||||
$this->setCodeName($this->getTitle());
|
||||
$this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
|
||||
|
|
@ -363,12 +363,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
$this->_protection = new PHPExcel_Worksheet_Protection();
|
||||
|
||||
// Default row dimension
|
||||
$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(NULL);
|
||||
$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(null);
|
||||
|
||||
// Default column dimension
|
||||
$this->_defaultColumnDimension = new PHPExcel_Worksheet_ColumnDimension(NULL);
|
||||
$this->_defaultColumnDimension = new PHPExcel_Worksheet_ColumnDimension(null);
|
||||
|
||||
$this->_autoFilter = new PHPExcel_Worksheet_AutoFilter(NULL, $this);
|
||||
$this->_autoFilter = new PHPExcel_Worksheet_AutoFilter(null, $this);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -377,10 +377,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* typically so that the worksheet object can be unset
|
||||
*
|
||||
*/
|
||||
public function disconnectCells() {
|
||||
if ( $this->_cellCollection !== NULL) {
|
||||
public function disconnectCells()
|
||||
{
|
||||
if ($this->_cellCollection !== null) {
|
||||
$this->_cellCollection->unsetWorksheetCells();
|
||||
$this->_cellCollection = NULL;
|
||||
$this->_cellCollection = null;
|
||||
}
|
||||
// detach ourself from the workbook, so that it can then delete this worksheet successfully
|
||||
$this->_parent = null;
|
||||
|
|
@ -390,9 +391,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* Code to execute when this worksheet is unset()
|
||||
*
|
||||
*/
|
||||
function __destruct() {
|
||||
PHPExcel_Calculation::getInstance($this->_parent)
|
||||
->clearCalculationCacheForWorksheet($this->_title);
|
||||
function __destruct()
|
||||
{
|
||||
PHPExcel_Calculation::getInstance($this->_parent)->clearCalculationCacheForWorksheet($this->_title);
|
||||
|
||||
$this->disconnectCells();
|
||||
}
|
||||
|
|
@ -402,7 +403,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel_CachedObjectStorage_xxx
|
||||
*/
|
||||
public function getCellCacheController() {
|
||||
public function getCellCacheController()
|
||||
{
|
||||
return $this->_cellCollection;
|
||||
} // function getCellCacheController()
|
||||
|
||||
|
|
@ -432,8 +434,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
}
|
||||
// Some of the printable ASCII characters are invalid: * : / \ ? [ ] and first and last characters cannot be a "'"
|
||||
if ((str_replace(self::$_invalidCharacters, '', $pValue) !== $pValue) ||
|
||||
(PHPExcel_Shared_String::Substring($pValue,-1,1)=='\'') ||
|
||||
(PHPExcel_Shared_String::Substring($pValue,0,1)=='\'')) {
|
||||
(PHPExcel_Shared_String::Substring($pValue, -1, 1)=='\'') ||
|
||||
(PHPExcel_Shared_String::Substring($pValue, 0, 1)=='\'')) {
|
||||
throw new PHPExcel_Exception('Invalid character found in sheet code name');
|
||||
}
|
||||
|
||||
|
|
@ -479,7 +481,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Re-order cell collection
|
||||
return $this->sortCellCollection();
|
||||
}
|
||||
if ($this->_cellCollection !== NULL) {
|
||||
if ($this->_cellCollection !== null) {
|
||||
return $this->_cellCollection->getCellList();
|
||||
}
|
||||
return array();
|
||||
|
|
@ -492,7 +494,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*/
|
||||
public function sortCellCollection()
|
||||
{
|
||||
if ($this->_cellCollection !== NULL) {
|
||||
if ($this->_cellCollection !== null) {
|
||||
return $this->_cellCollection->getSortedCellList();
|
||||
}
|
||||
return array();
|
||||
|
|
@ -725,7 +727,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
|
||||
// There is only something to do if there are some auto-size columns
|
||||
if (!empty($autoSizes)) {
|
||||
|
||||
// build list of cells references that participate in a merge
|
||||
$isMergeCell = array();
|
||||
foreach ($this->getMergeCells() as $cells) {
|
||||
|
|
@ -762,7 +763,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
|
||||
// adjust column widths
|
||||
foreach ($autoSizes as $columnIndex => $width) {
|
||||
if ($width == -1) $width = $this->getDefaultColumnDimension()->getWidth();
|
||||
if ($width == -1) {
|
||||
$width = $this->getDefaultColumnDimension()->getWidth();
|
||||
}
|
||||
$this->getColumnDimension($columnIndex)->setWidth($width);
|
||||
}
|
||||
}
|
||||
|
|
@ -775,7 +778,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel
|
||||
*/
|
||||
public function getParent() {
|
||||
public function getParent()
|
||||
{
|
||||
return $this->_parent;
|
||||
}
|
||||
|
||||
|
|
@ -785,7 +789,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param PHPExcel $parent
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function rebindParent(PHPExcel $parent) {
|
||||
public function rebindParent(PHPExcel $parent)
|
||||
{
|
||||
if ($this->_parent !== null) {
|
||||
$namedRanges = $this->_parent->getNamedRanges();
|
||||
foreach ($namedRanges as $namedRange) {
|
||||
|
|
@ -841,18 +846,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Use name, but append with lowest possible integer
|
||||
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 29);
|
||||
}
|
||||
$i = 1;
|
||||
while ($this->_parent->sheetNameExists($pValue . ' ' . $i)) {
|
||||
++$i;
|
||||
if ($i == 10) {
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 28);
|
||||
}
|
||||
} elseif ($i == 100) {
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 27);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -871,9 +876,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
$newTitle = $this->getTitle();
|
||||
PHPExcel_Calculation::getInstance($this->_parent)
|
||||
->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
|
||||
if ($updateFormulaCellReferences)
|
||||
if ($updateFormulaCellReferences) {
|
||||
PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_parent, $oldTitle, $newTitle);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -883,7 +889,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return string Sheet state (visible, hidden, veryHidden)
|
||||
*/
|
||||
public function getSheetState() {
|
||||
public function getSheetState()
|
||||
{
|
||||
return $this->_sheetState;
|
||||
}
|
||||
|
||||
|
|
@ -893,7 +900,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param string $value Sheet state (visible, hidden, veryHidden)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE) {
|
||||
public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE)
|
||||
{
|
||||
$this->_sheetState = $value;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -1159,7 +1167,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
|
||||
(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
|
||||
$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
|
||||
if ($namedRange !== NULL) {
|
||||
if ($namedRange !== null) {
|
||||
$pCoordinate = $namedRange->getRange();
|
||||
return $namedRange->getWorksheet()->getCell($pCoordinate);
|
||||
}
|
||||
|
|
@ -1207,29 +1215,26 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
{
|
||||
$cell = $this->_cellCollection->addCacheData(
|
||||
$pCoordinate,
|
||||
new PHPExcel_Cell(
|
||||
NULL,
|
||||
PHPExcel_Cell_DataType::TYPE_NULL,
|
||||
$this
|
||||
)
|
||||
new PHPExcel_Cell(null, PHPExcel_Cell_DataType::TYPE_NULL, $this)
|
||||
);
|
||||
$this->_cellCollectionIsSorted = false;
|
||||
|
||||
// Coordinates
|
||||
$aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
|
||||
if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
|
||||
if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0])) {
|
||||
$this->_cachedHighestColumn = $aCoordinates[0];
|
||||
}
|
||||
$this->_cachedHighestRow = max($this->_cachedHighestRow, $aCoordinates[1]);
|
||||
|
||||
// Cell needs appropriate xfIndex from dimensions records
|
||||
// but don't create dimension records if they don't already exist
|
||||
$rowDimension = $this->getRowDimension($aCoordinates[1], FALSE);
|
||||
$columnDimension = $this->getColumnDimension($aCoordinates[0], FALSE);
|
||||
$rowDimension = $this->getRowDimension($aCoordinates[1], false);
|
||||
$columnDimension = $this->getColumnDimension($aCoordinates[0], false);
|
||||
|
||||
if ($rowDimension !== NULL && $rowDimension->getXfIndex() > 0) {
|
||||
if ($rowDimension !== null && $rowDimension->getXfIndex() > 0) {
|
||||
// then there is a row dimension with explicit style, assign it to the cell
|
||||
$cell->setXfIndex($rowDimension->getXfIndex());
|
||||
} elseif ($columnDimension !== NULL && $columnDimension->getXfIndex() > 0) {
|
||||
} elseif ($columnDimension !== null && $columnDimension->getXfIndex() > 0) {
|
||||
// then there is a column dimension, assign it to the cell
|
||||
$cell->setXfIndex($columnDimension->getXfIndex());
|
||||
}
|
||||
|
|
@ -1256,7 +1261,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
|
||||
(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
|
||||
$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
|
||||
if ($namedRange !== NULL) {
|
||||
if ($namedRange !== null) {
|
||||
$pCoordinate = $namedRange->getRange();
|
||||
if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
|
||||
if (!$namedRange->getLocalOnly()) {
|
||||
|
|
@ -1265,16 +1270,17 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
throw new PHPExcel_Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
else { return false; }
|
||||
}
|
||||
|
||||
// Uppercase coordinate
|
||||
$pCoordinate = strtoupper($pCoordinate);
|
||||
|
||||
if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
|
||||
if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
|
||||
throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
|
||||
} elseif (strpos($pCoordinate,'$') !== false) {
|
||||
} elseif (strpos($pCoordinate, '$') !== false) {
|
||||
throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
|
||||
} else {
|
||||
// Coordinates
|
||||
|
|
@ -1303,15 +1309,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param int $pRow Numeric index of the row
|
||||
* @return PHPExcel_Worksheet_RowDimension
|
||||
*/
|
||||
public function getRowDimension($pRow = 1, $create = TRUE)
|
||||
public function getRowDimension($pRow = 1, $create = true)
|
||||
{
|
||||
// Found
|
||||
$found = null;
|
||||
|
||||
// Get row dimension
|
||||
if (!isset($this->_rowDimensions[$pRow])) {
|
||||
if (!$create)
|
||||
return NULL;
|
||||
if (!$create) {
|
||||
return null;
|
||||
}
|
||||
$this->_rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
|
||||
|
||||
$this->_cachedHighestRow = max($this->_cachedHighestRow, $pRow);
|
||||
|
|
@ -1325,20 +1332,22 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param string $pColumn String index of the column
|
||||
* @return PHPExcel_Worksheet_ColumnDimension
|
||||
*/
|
||||
public function getColumnDimension($pColumn = 'A', $create = TRUE)
|
||||
public function getColumnDimension($pColumn = 'A', $create = true)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$pColumn = strtoupper($pColumn);
|
||||
|
||||
// Fetch dimensions
|
||||
if (!isset($this->_columnDimensions[$pColumn])) {
|
||||
if (!$create)
|
||||
return NULL;
|
||||
if (!$create) {
|
||||
return null;
|
||||
}
|
||||
$this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
|
||||
|
||||
if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
|
||||
if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn)) {
|
||||
$this->_cachedHighestColumn = $pColumn;
|
||||
}
|
||||
}
|
||||
return $this->_columnDimensions[$pColumn];
|
||||
}
|
||||
|
||||
|
|
@ -1488,8 +1497,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1, $pColumn2 = null, $pRow2 = null)
|
||||
{
|
||||
if (!is_null($pColumn2) && !is_null($pRow2)) {
|
||||
$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow . ':' .
|
||||
PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
|
||||
$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
|
||||
return $this->getStyle($cellRange);
|
||||
}
|
||||
|
||||
|
|
@ -1680,7 +1688,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Uppercase coordinate
|
||||
$pRange = strtoupper($pRange);
|
||||
|
||||
if (strpos($pRange,':') !== false) {
|
||||
if (strpos($pRange, ':') !== false) {
|
||||
$this->_mergeCells[$pRange] = $pRange;
|
||||
|
||||
// make sure cells are created
|
||||
|
|
@ -1699,7 +1707,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
for ($i = 1; $i < $count; $i++) {
|
||||
$this->getCell($aReferences[$i])->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
|
||||
}
|
||||
|
||||
} else {
|
||||
throw new PHPExcel_Exception('Merge must be set on a range of cells.');
|
||||
}
|
||||
|
|
@ -1735,7 +1742,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Uppercase coordinate
|
||||
$pRange = strtoupper($pRange);
|
||||
|
||||
if (strpos($pRange,':') !== false) {
|
||||
if (strpos($pRange, ':') !== false) {
|
||||
if (isset($this->_mergeCells[$pRange])) {
|
||||
unset($this->_mergeCells[$pRange]);
|
||||
} else {
|
||||
|
|
@ -1783,7 +1790,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
public function setMergeCells($pValue = array())
|
||||
{
|
||||
$this->_mergeCells = $pValue;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
@ -1896,7 +1902,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
public function setAutoFilter($pValue)
|
||||
{
|
||||
$pRange = strtoupper($pValue);
|
||||
|
||||
if (is_string($pValue)) {
|
||||
$this->_autoFilter->setRange($pValue);
|
||||
} elseif (is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
|
||||
|
|
@ -1931,7 +1936,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*/
|
||||
public function removeAutoFilter()
|
||||
{
|
||||
$this->_autoFilter->setRange(NULL);
|
||||
$this->_autoFilter->setRange(null);
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
@ -1961,8 +1966,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
{
|
||||
// Uppercase coordinate
|
||||
$pCell = strtoupper($pCell);
|
||||
|
||||
if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
|
||||
if (strpos($pCell, ':') === false && strpos($pCell, ',') === false) {
|
||||
$this->_freezePane = $pCell;
|
||||
} else {
|
||||
throw new PHPExcel_Exception('Freeze pane can not be set on a range of cells.');
|
||||
|
|
@ -2001,7 +2005,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
|
||||
public function insertNewRowBefore($pBefore = 1, $pNumRows = 1)
|
||||
{
|
||||
if ($pBefore >= 1) {
|
||||
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
|
||||
$objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
|
||||
|
|
@ -2019,7 +2024,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
|
||||
public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1)
|
||||
{
|
||||
if (!is_numeric($pBefore)) {
|
||||
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
|
||||
$objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
|
||||
|
|
@ -2037,7 +2043,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) {
|
||||
public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1)
|
||||
{
|
||||
if ($pBefore >= 0) {
|
||||
return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
|
||||
} else {
|
||||
|
|
@ -2053,12 +2060,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function removeRow($pRow = 1, $pNumRows = 1) {
|
||||
public function removeRow($pRow = 1, $pNumRows = 1)
|
||||
{
|
||||
if ($pRow >= 1) {
|
||||
$highestRow = $this->getHighestDataRow();
|
||||
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
|
||||
$objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
|
||||
for($r = 0; $r < $pNumRows; ++$r) {
|
||||
for ($r = 0; $r < $pNumRows; ++$r) {
|
||||
$this->getCellCacheController()->removeRow($highestRow);
|
||||
--$highestRow;
|
||||
}
|
||||
|
|
@ -2076,13 +2084,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function removeColumn($pColumn = 'A', $pNumCols = 1) {
|
||||
public function removeColumn($pColumn = 'A', $pNumCols = 1)
|
||||
{
|
||||
if (!is_numeric($pColumn)) {
|
||||
$highestColumn = $this->getHighestDataColumn();
|
||||
$pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
|
||||
$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
|
||||
$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
|
||||
for($c = 0; $c < $pNumCols; ++$c) {
|
||||
for ($c = 0; $c < $pNumCols; ++$c) {
|
||||
$this->getCellCacheController()->removeColumn($highestColumn);
|
||||
$highestColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($highestColumn) - 2);
|
||||
}
|
||||
|
|
@ -2100,7 +2109,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) {
|
||||
public function removeColumnByIndex($pColumn = 0, $pNumCols = 1)
|
||||
{
|
||||
if ($pColumn >= 0) {
|
||||
return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
|
||||
} else {
|
||||
|
|
@ -2113,7 +2123,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getShowGridlines() {
|
||||
public function getShowGridlines()
|
||||
{
|
||||
return $this->_showGridlines;
|
||||
}
|
||||
|
||||
|
|
@ -2123,7 +2134,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $pValue Show gridlines (true/false)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setShowGridlines($pValue = false) {
|
||||
public function setShowGridlines($pValue = false)
|
||||
{
|
||||
$this->_showGridlines = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2133,7 +2145,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getPrintGridlines() {
|
||||
public function getPrintGridlines()
|
||||
{
|
||||
return $this->_printGridlines;
|
||||
}
|
||||
|
||||
|
|
@ -2143,7 +2156,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $pValue Print gridlines (true/false)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setPrintGridlines($pValue = false) {
|
||||
public function setPrintGridlines($pValue = false)
|
||||
{
|
||||
$this->_printGridlines = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2153,7 +2167,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getShowRowColHeaders() {
|
||||
public function getShowRowColHeaders()
|
||||
{
|
||||
return $this->_showRowColHeaders;
|
||||
}
|
||||
|
||||
|
|
@ -2163,7 +2178,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $pValue Show row and column headers (true/false)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setShowRowColHeaders($pValue = false) {
|
||||
public function setShowRowColHeaders($pValue = false)
|
||||
{
|
||||
$this->_showRowColHeaders = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2173,7 +2189,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getShowSummaryBelow() {
|
||||
public function getShowSummaryBelow()
|
||||
{
|
||||
return $this->_showSummaryBelow;
|
||||
}
|
||||
|
||||
|
|
@ -2183,7 +2200,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $pValue Show summary below (true/false)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setShowSummaryBelow($pValue = true) {
|
||||
public function setShowSummaryBelow($pValue = true)
|
||||
{
|
||||
$this->_showSummaryBelow = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2193,7 +2211,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getShowSummaryRight() {
|
||||
public function getShowSummaryRight()
|
||||
{
|
||||
return $this->_showSummaryRight;
|
||||
}
|
||||
|
||||
|
|
@ -2203,7 +2222,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $pValue Show summary right (true/false)
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setShowSummaryRight($pValue = true) {
|
||||
public function setShowSummaryRight($pValue = true)
|
||||
{
|
||||
$this->_showSummaryRight = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2243,9 +2263,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Uppercase coordinate
|
||||
$pCellCoordinate = strtoupper($pCellCoordinate);
|
||||
|
||||
if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
|
||||
if (strpos($pCellCoordinate, ':') !== false || strpos($pCellCoordinate, ',') !== false) {
|
||||
throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells.');
|
||||
} else if (strpos($pCellCoordinate,'$') !== false) {
|
||||
} else if (strpos($pCellCoordinate, '$') !== false) {
|
||||
throw new PHPExcel_Exception('Cell coordinate string must not be absolute.');
|
||||
} else if ($pCellCoordinate == '') {
|
||||
throw new PHPExcel_Exception('Cell coordinate can not be zero-length string.');
|
||||
|
|
@ -2340,7 +2360,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Convert '1:3' to 'A1:XFD3'
|
||||
$pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
|
||||
|
||||
if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
|
||||
if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
|
||||
list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
|
||||
$this->_activeCell = $first[0];
|
||||
} else {
|
||||
|
|
@ -2368,7 +2388,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getRightToLeft() {
|
||||
public function getRightToLeft()
|
||||
{
|
||||
return $this->_rightToLeft;
|
||||
}
|
||||
|
||||
|
|
@ -2378,7 +2399,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param boolean $value Right-to-left true/false
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function setRightToLeft($value = false) {
|
||||
public function setRightToLeft($value = false)
|
||||
{
|
||||
$this->_rightToLeft = $value;
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -2393,7 +2415,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
|
||||
public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false)
|
||||
{
|
||||
if (is_array($source)) {
|
||||
// Convert a 1-D array to 2-D (for ease of looping)
|
||||
if (!is_array(end($source))) {
|
||||
|
|
@ -2439,7 +2462,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* True - Return rows and columns indexed by their actual row and column IDs
|
||||
* @return array
|
||||
*/
|
||||
public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
|
||||
public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
|
||||
{
|
||||
// Returnvalue
|
||||
$returnValue = array();
|
||||
// Identify the range that we need to extract from the worksheet
|
||||
|
|
@ -2478,9 +2502,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
$style = $this->_parent->getCellXfByIndex($cell->getXfIndex());
|
||||
$returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString(
|
||||
$returnValue[$rRef][$cRef],
|
||||
($style && $style->getNumberFormat()) ?
|
||||
$style->getNumberFormat()->getFormatCode() :
|
||||
PHPExcel_Style_NumberFormat::FORMAT_GENERAL
|
||||
($style && $style->getNumberFormat()) ? $style->getNumberFormat()->getFormatCode() : PHPExcel_Style_NumberFormat::FORMAT_GENERAL
|
||||
);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -2511,14 +2533,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @return array
|
||||
* @throws PHPExcel_Exception
|
||||
*/
|
||||
public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
|
||||
public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
|
||||
{
|
||||
$namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
|
||||
if ($namedRange !== NULL) {
|
||||
if ($namedRange !== null) {
|
||||
$pWorkSheet = $namedRange->getWorksheet();
|
||||
$pCellRange = $namedRange->getRange();
|
||||
|
||||
return $pWorkSheet->rangeToArray( $pCellRange,
|
||||
$nullValue, $calculateFormulas, $formatData, $returnCellRef);
|
||||
return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
|
||||
}
|
||||
|
||||
throw new PHPExcel_Exception('Named Range '.$pNamedRange.' does not exist.');
|
||||
|
|
@ -2535,7 +2557,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* True - Return rows and columns indexed by their actual row and column IDs
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
|
||||
public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
|
||||
{
|
||||
// Garbage collect...
|
||||
$this->garbageCollect();
|
||||
|
||||
|
|
@ -2543,8 +2566,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
$maxCol = $this->getHighestColumn();
|
||||
$maxRow = $this->getHighestRow();
|
||||
// Return
|
||||
return $this->rangeToArray( 'A1:'.$maxCol.$maxRow,
|
||||
$nullValue, $calculateFormulas, $formatData, $returnCellRef);
|
||||
return $this->rangeToArray('A1:'.$maxCol.$maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2555,7 +2577,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel_Worksheet_RowIterator
|
||||
*/
|
||||
public function getRowIterator($startRow = 1, $endRow = null) {
|
||||
public function getRowIterator($startRow = 1, $endRow = null)
|
||||
{
|
||||
return new PHPExcel_Worksheet_RowIterator($this, $startRow, $endRow);
|
||||
}
|
||||
|
||||
|
|
@ -2567,7 +2590,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel_Worksheet_ColumnIterator
|
||||
*/
|
||||
public function getColumnIterator($startColumn = 'A', $endColumn = null) {
|
||||
public function getColumnIterator($startColumn = 'A', $endColumn = null)
|
||||
{
|
||||
return new PHPExcel_Worksheet_ColumnIterator($this, $startColumn, $endColumn);
|
||||
}
|
||||
|
||||
|
|
@ -2576,7 +2600,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function garbageCollect() {
|
||||
public function garbageCollect()
|
||||
{
|
||||
// Flush cache
|
||||
$this->_cellCollection->getCacheData('A1');
|
||||
// Build a reference table from images
|
||||
|
|
@ -2595,7 +2620,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
|
||||
// Loop through column dimensions
|
||||
foreach ($this->_columnDimensions as $dimension) {
|
||||
$highestColumn = max($highestColumn,PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
|
||||
$highestColumn = max($highestColumn, PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
|
||||
}
|
||||
|
||||
// Loop through row dimensions
|
||||
|
|
@ -2620,13 +2645,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return string Hash code
|
||||
*/
|
||||
public function getHashCode() {
|
||||
public function getHashCode()
|
||||
{
|
||||
if ($this->_dirty) {
|
||||
$this->_hash = md5( $this->_title .
|
||||
$this->_autoFilter .
|
||||
($this->_protection->isProtectionEnabled() ? 't' : 'f') .
|
||||
__CLASS__
|
||||
);
|
||||
$this->_hash = md5($this->_title . $this->_autoFilter . ($this->_protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__);
|
||||
$this->_dirty = false;
|
||||
}
|
||||
return $this->_hash;
|
||||
|
|
@ -2642,17 +2664,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param bool $returnRange Return range? (see example)
|
||||
* @return mixed
|
||||
*/
|
||||
public static function extractSheetTitle($pRange, $returnRange = false) {
|
||||
public static function extractSheetTitle($pRange, $returnRange = false)
|
||||
{
|
||||
// Sheet title included?
|
||||
if (($sep = strpos($pRange, '!')) === false) {
|
||||
return '';
|
||||
}
|
||||
|
||||
if ($returnRange) {
|
||||
return array(
|
||||
trim(substr($pRange, 0, $sep),"'"),
|
||||
substr($pRange, $sep + 1)
|
||||
);
|
||||
return array(trim(substr($pRange, 0, $sep), "'"), substr($pRange, $sep + 1));
|
||||
}
|
||||
|
||||
return substr($pRange, $sep + 1);
|
||||
|
|
@ -2774,7 +2794,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @param string $range
|
||||
* @return string Adjusted range value
|
||||
*/
|
||||
public function shrinkRangeToFit($range) {
|
||||
public function shrinkRangeToFit($range)
|
||||
{
|
||||
$maxCol = $this->getHighestColumn();
|
||||
$maxRow = $this->getHighestRow();
|
||||
$maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
|
||||
|
|
@ -2783,10 +2804,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
foreach ($rangeBlocks as &$rangeSet) {
|
||||
$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
|
||||
|
||||
if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) { $rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
|
||||
if ($rangeBoundaries[0][1] > $maxRow) { $rangeBoundaries[0][1] = $maxRow; }
|
||||
if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) { $rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
|
||||
if ($rangeBoundaries[1][1] > $maxRow) { $rangeBoundaries[1][1] = $maxRow; }
|
||||
if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) {
|
||||
$rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol);
|
||||
}
|
||||
if ($rangeBoundaries[0][1] > $maxRow) {
|
||||
$rangeBoundaries[0][1] = $maxRow;
|
||||
}
|
||||
if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) {
|
||||
$rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol);
|
||||
}
|
||||
if ($rangeBoundaries[1][1] > $maxRow) {
|
||||
$rangeBoundaries[1][1] = $maxRow;
|
||||
}
|
||||
$rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
|
||||
}
|
||||
unset($rangeSet);
|
||||
|
|
@ -2802,9 +2831,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*/
|
||||
public function getTabColor()
|
||||
{
|
||||
if ($this->_tabColor === NULL)
|
||||
if ($this->_tabColor === null) {
|
||||
$this->_tabColor = new PHPExcel_Style_Color();
|
||||
|
||||
}
|
||||
return $this->_tabColor;
|
||||
}
|
||||
|
||||
|
|
@ -2828,7 +2857,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*/
|
||||
public function isTabColorSet()
|
||||
{
|
||||
return ($this->_tabColor !== NULL);
|
||||
return ($this->_tabColor !== null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2836,7 +2865,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return PHPExcel_Worksheet
|
||||
*/
|
||||
public function copy() {
|
||||
public function copy()
|
||||
{
|
||||
$copied = clone $this;
|
||||
|
||||
return $copied;
|
||||
|
|
@ -2845,7 +2875,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
/**
|
||||
* Implement PHP __clone to create a deep clone, not just a shallow copy.
|
||||
*/
|
||||
public function __clone() {
|
||||
public function __clone()
|
||||
{
|
||||
foreach ($this as $key => $val) {
|
||||
if ($key == '_parent') {
|
||||
continue;
|
||||
|
|
@ -2876,7 +2907,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
* @return objWorksheet
|
||||
* @throws PHPExcel_Exception
|
||||
*/
|
||||
public function setCodeName($pValue=null) {
|
||||
public function setCodeName($pValue = null)
|
||||
{
|
||||
// Is this a 'rename' or not?
|
||||
if ($this->getCodeName() == $pValue) {
|
||||
return $this;
|
||||
|
|
@ -2894,18 +2926,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
// Use name, but append with lowest possible integer
|
||||
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 29);
|
||||
}
|
||||
$i = 1;
|
||||
while ($this->getParent()->sheetCodeNameExists($pValue . '_' . $i)) {
|
||||
++$i;
|
||||
if ($i == 10) {
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 28);
|
||||
}
|
||||
} elseif ($i == 100) {
|
||||
if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
|
||||
$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 27);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2924,14 +2956,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
|
|||
*
|
||||
* @return null|string
|
||||
*/
|
||||
public function getCodeName() {
|
||||
public function getCodeName()
|
||||
{
|
||||
return $this->_codeName;
|
||||
}
|
||||
/**
|
||||
* Sheet has a code name ?
|
||||
* @return boolean
|
||||
*/
|
||||
public function hasCodeName() {
|
||||
public function hasCodeName()
|
||||
{
|
||||
return !(is_null($this->_codeName));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
public function setRange($pRange = '')
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$cellAddress = explode('!',strtoupper($pRange));
|
||||
$cellAddress = explode('!', strtoupper($pRange));
|
||||
if (count($cellAddress) > 1) {
|
||||
list($worksheet, $pRange) = $cellAddress;
|
||||
}
|
||||
|
|
@ -349,7 +349,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
}
|
||||
foreach ($dateSet as $dateValue) {
|
||||
// Use of substr to extract value at the appropriate group level
|
||||
if (substr($dtVal,0,strlen($dateValue)) == $dateValue) {
|
||||
if (substr($dtVal, 0, strlen($dateValue)) == $dateValue) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -381,34 +381,34 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
if (is_numeric($rule['value'])) {
|
||||
// Numeric values are tested using the appropriate operator
|
||||
switch ($rule['operator']) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
|
||||
$retVal = ($cellValue == $rule['value']);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
|
||||
$retVal = ($cellValue != $rule['value']);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
|
||||
$retVal = ($cellValue > $rule['value']);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
|
||||
$retVal = ($cellValue >= $rule['value']);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
|
||||
$retVal = ($cellValue < $rule['value']);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
|
||||
$retVal = ($cellValue <= $rule['value']);
|
||||
break;
|
||||
}
|
||||
} elseif ($rule['value'] == '') {
|
||||
switch ($rule['operator']) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
|
||||
$retVal = (($cellValue == '') || ($cellValue === null));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
|
||||
$retVal = (($cellValue != '') && ($cellValue !== null));
|
||||
break;
|
||||
default :
|
||||
default:
|
||||
$retVal = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -418,7 +418,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
}
|
||||
// If there are multiple conditions, then we need to test both using the appropriate join operator
|
||||
switch ($join) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR:
|
||||
$returnVal = $returnVal || $retVal;
|
||||
// Break as soon as we have a TRUE match for OR joins,
|
||||
// to avoid unnecessary additional code execution
|
||||
|
|
@ -426,7 +426,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
return $returnVal;
|
||||
}
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND:
|
||||
$returnVal = $returnVal && $retVal;
|
||||
break;
|
||||
}
|
||||
|
|
@ -450,7 +450,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
}
|
||||
|
||||
if (is_numeric($cellValue)) {
|
||||
$dateValue = date('m',PHPExcel_Shared_Date::ExcelToPHP($cellValue));
|
||||
$dateValue = date('m', PHPExcel_Shared_Date::ExcelToPHP($cellValue));
|
||||
if (in_array($dateValue, $monthSet)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -485,69 +485,69 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
$baseDate = PHPExcel_Calculation_DateTime::DATENOW();
|
||||
// Calculate start/end dates for the required date range based on current date
|
||||
switch ($dynamicRuleType) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
|
||||
$baseDate = strtotime('-7 days', $baseDate);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
|
||||
$baseDate = strtotime('-7 days', $baseDate);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
|
||||
$baseDate = strtotime('-1 month',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
|
||||
$baseDate = strtotime('-1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
|
||||
$baseDate = strtotime('+1 month',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
|
||||
$baseDate = strtotime('+1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
|
||||
$baseDate = strtotime('-3 month',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
|
||||
$baseDate = strtotime('-3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
|
||||
$baseDate = strtotime('+3 month',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
|
||||
$baseDate = strtotime('+3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
|
||||
$baseDate = strtotime('-1 year',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
|
||||
$baseDate = strtotime('-1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
|
||||
$baseDate = strtotime('+1 year',gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
|
||||
$baseDate = strtotime('+1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
}
|
||||
|
||||
switch ($dynamicRuleType) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
|
||||
$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day', $baseDate));
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE:
|
||||
$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day', $baseDate));
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
|
||||
$maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 31, 12, date('Y', $baseDate)));
|
||||
++$maxVal;
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
|
||||
$thisMonth = date('m', $baseDate);
|
||||
$thisQuarter = floor(--$thisMonth / 3);
|
||||
$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), (1+$thisQuarter)*3, date('Y', $baseDate)));
|
||||
++$maxVal;
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1+$thisQuarter*3, date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
|
||||
$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), date('m', $baseDate), date('Y', $baseDate)));
|
||||
++$maxVal;
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
|
||||
$dayOfWeek = date('w', $baseDate);
|
||||
$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
|
||||
$maxVal = $val + 7;
|
||||
|
|
@ -556,11 +556,11 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
|
||||
switch ($dynamicRuleType) {
|
||||
// Adjust Today dates for Yesterday and Tomorrow
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
|
||||
--$maxVal;
|
||||
--$val;
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
|
||||
++$maxVal;
|
||||
++$val;
|
||||
break;
|
||||
|
|
@ -589,7 +589,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
sort($dataValues);
|
||||
}
|
||||
|
||||
return array_pop(array_slice($dataValues,0, $ruleValue));
|
||||
return array_pop(array_slice($dataValues, 0, $ruleValue));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -610,7 +610,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
foreach ($this->_columns as $columnID => $filterColumn) {
|
||||
$rules = $filterColumn->getRules();
|
||||
switch ($filterColumn->getFilterType()) {
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER:
|
||||
$ruleValues = array();
|
||||
// Build a list of the filter value selections
|
||||
foreach ($rules as $rule) {
|
||||
|
|
@ -620,8 +620,9 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
// Test if we want to include blanks in our filter criteria
|
||||
$blanks = false;
|
||||
$ruleDataSet = array_filter($ruleValues);
|
||||
if (count($ruleValues) != count($ruleDataSet))
|
||||
if (count($ruleValues) != count($ruleDataSet)) {
|
||||
$blanks = true;
|
||||
}
|
||||
if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
|
||||
// Filter on absolute values
|
||||
$columnFilterTests[$columnID] = array(
|
||||
|
|
@ -638,23 +639,29 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
foreach ($ruleDataSet as $ruleValue) {
|
||||
$date = $time = '';
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')) {
|
||||
$date .= sprintf('%04d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
|
||||
}
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')) {
|
||||
$date .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
|
||||
}
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')) {
|
||||
$date .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
|
||||
}
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')) {
|
||||
$time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
|
||||
}
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')) {
|
||||
$time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
|
||||
}
|
||||
if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
|
||||
($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) {
|
||||
$time .= sprintf('%02d', $ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
|
||||
}
|
||||
$dateTime = $date . $time;
|
||||
$arguments['date'][] = $date;
|
||||
$arguments['time'][] = $time;
|
||||
|
|
@ -670,7 +677,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
);
|
||||
}
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER:
|
||||
$customRuleForBlanks = false;
|
||||
$ruleValues = array();
|
||||
// Build a list of the filter value selections
|
||||
|
|
@ -680,7 +687,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
if (!is_numeric($ruleValue)) {
|
||||
// Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
|
||||
$ruleValue = preg_quote($ruleValue);
|
||||
$ruleValue = str_replace(self::$_fromReplace,self::$_toReplace, $ruleValue);
|
||||
$ruleValue = str_replace(self::$_fromReplace, self::$_toReplace, $ruleValue);
|
||||
if (trim($ruleValue) == '') {
|
||||
$customRuleForBlanks = true;
|
||||
$ruleValue = trim($ruleValue);
|
||||
|
|
@ -694,7 +701,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
'arguments' => array('filterRules' => $ruleValues, 'join' => $join, 'customRuleForBlanks' => $customRuleForBlanks)
|
||||
);
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER:
|
||||
$ruleValues = array();
|
||||
foreach ($rules as $rule) {
|
||||
// We should only ever have one Dynamic Filter Rule anyway
|
||||
|
|
@ -704,7 +711,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
// Number (Average) based
|
||||
// Calculate the average
|
||||
$averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
|
||||
$average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula,null, $this->_workSheet->getCell('A1'));
|
||||
$average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula, null, $this->_workSheet->getCell('A1'));
|
||||
// Set above/below rule based on greaterThan or LessTan
|
||||
$operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
|
||||
? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
|
||||
|
|
@ -720,14 +727,14 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
// Date based
|
||||
if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') {
|
||||
// Month or Quarter
|
||||
sscanf($dynamicRuleType,'%[A-Z]%d', $periodType, $period);
|
||||
sscanf($dynamicRuleType, '%[A-Z]%d', $periodType, $period);
|
||||
if ($periodType == 'M') {
|
||||
$ruleValues = array($period);
|
||||
} else {
|
||||
--$period;
|
||||
$periodEnd = (1+$period)*3;
|
||||
$periodStart = 1+$period*3;
|
||||
$ruleValues = range($periodStart,periodEnd);
|
||||
$ruleValues = range($periodStart, $periodEnd);
|
||||
}
|
||||
$columnFilterTests[$columnID] = array(
|
||||
'method' => '_filterTestInPeriodDateSet',
|
||||
|
|
@ -742,7 +749,7 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
}
|
||||
}
|
||||
break;
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
|
||||
case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER:
|
||||
$ruleValues = array();
|
||||
$dataRowCount = $rangeEnd[1] - $rangeStart[1];
|
||||
foreach ($rules as $rule) {
|
||||
|
|
@ -754,8 +761,12 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
|
||||
$ruleValue = floor($ruleValue * ($dataRowCount / 100));
|
||||
}
|
||||
if ($ruleValue < 1) $ruleValue = 1;
|
||||
if ($ruleValue > 500) $ruleValue = 500;
|
||||
if ($ruleValue < 1) {
|
||||
$ruleValue = 1;
|
||||
}
|
||||
if ($ruleValue > 500) {
|
||||
$ruleValue = 500;
|
||||
}
|
||||
|
||||
$maxVal = $this->_calculateTopTenValue($columnID, $rangeStart[1]+1, $rangeEnd[1], $toptenRuleType, $ruleValue);
|
||||
|
||||
|
|
@ -836,7 +847,8 @@ class PHPExcel_Worksheet_AutoFilter
|
|||
* toString method replicates previous behavior by returning the range if object is
|
||||
* referenced as a property of its parent.
|
||||
*/
|
||||
public function __toString() {
|
||||
public function __toString()
|
||||
{
|
||||
return (string) $this->_range;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -366,7 +366,8 @@ class PHPExcel_Worksheet_PageSetup
|
|||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getFitToPage() {
|
||||
public function getFitToPage()
|
||||
{
|
||||
return $this->_fitToPage;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue