Not relevant parameters when calling functions
This commit is contained in:
parent
c8a8fd2610
commit
a6a709a4ba
|
@ -3532,7 +3532,7 @@ class Calculation
|
||||||
$result = '#VALUE!';
|
$result = '#VALUE!';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$result = '"' . str_replace('""', '"', self::unwrapResult($operand1, '"') . self::unwrapResult($operand2, '"')) . '"';
|
$result = '"' . str_replace('""', '"', self::unwrapResult($operand1) . self::unwrapResult($operand2)) . '"';
|
||||||
}
|
}
|
||||||
$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
|
$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
|
||||||
$stack->push('Value', $result);
|
$stack->push('Value', $result);
|
||||||
|
|
|
@ -830,7 +830,7 @@ class JpGraph
|
||||||
$this->renderContourChart($groupCount, $dimensions);
|
$this->renderContourChart($groupCount, $dimensions);
|
||||||
break;
|
break;
|
||||||
case 'stockChart':
|
case 'stockChart':
|
||||||
$this->renderStockChart($groupCount, $dimensions);
|
$this->renderStockChart($groupCount);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
echo $chartType . ' is not yet implemented<br />';
|
echo $chartType . ' is not yet implemented<br />';
|
||||||
|
|
|
@ -4431,7 +4431,7 @@ class Xls extends BaseReader implements IReader
|
||||||
if (!$this->readDataOnly) {
|
if (!$this->readDataOnly) {
|
||||||
// offset: 0; size: 8; cell range address of all cells containing this hyperlink
|
// offset: 0; size: 8; cell range address of all cells containing this hyperlink
|
||||||
try {
|
try {
|
||||||
$cellRange = $this->readBIFF8CellRangeAddressFixed($recordData, 0, 8);
|
$cellRange = $this->readBIFF8CellRangeAddressFixed($recordData);
|
||||||
} catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
|
} catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,21 +116,13 @@ class Xlsx extends BaseReader implements IReader
|
||||||
|
|
||||||
// The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
|
// The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
|
||||||
$rels = simplexml_load_string(
|
$rels = simplexml_load_string(
|
||||||
$this->securityScan(
|
$this->securityScan($this->getFromZipArchive($zip, '_rels/.rels'))
|
||||||
$this->getFromZipArchive($zip, '_rels/.rels'),
|
|
||||||
'SimpleXMLElement',
|
|
||||||
\PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
|
|
||||||
)
|
|
||||||
); //~ http://schemas.openxmlformats.org/package/2006/relationships");
|
); //~ http://schemas.openxmlformats.org/package/2006/relationships");
|
||||||
foreach ($rels->Relationship as $rel) {
|
foreach ($rels->Relationship as $rel) {
|
||||||
switch ($rel['Type']) {
|
switch ($rel['Type']) {
|
||||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||||
$xmlWorkbook = simplexml_load_string(
|
$xmlWorkbook = simplexml_load_string(
|
||||||
$this->securityScan(
|
$this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}"))
|
||||||
$this->getFromZipArchive($zip, "{$rel['Target']}"),
|
|
||||||
'SimpleXMLElement',
|
|
||||||
\PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
|
|
||||||
)
|
|
||||||
); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||||
|
|
||||||
if ($xmlWorkbook->sheets) {
|
if ($xmlWorkbook->sheets) {
|
||||||
|
|
|
@ -83,7 +83,7 @@ class Chart
|
||||||
foreach ($chartDetails as $chartDetailKey => $chartDetail) {
|
foreach ($chartDetails as $chartDetailKey => $chartDetail) {
|
||||||
switch ($chartDetailKey) {
|
switch ($chartDetailKey) {
|
||||||
case 'layout':
|
case 'layout':
|
||||||
$plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
|
$plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
|
||||||
break;
|
break;
|
||||||
case 'catAx':
|
case 'catAx':
|
||||||
if (isset($chartDetail->title)) {
|
if (isset($chartDetail->title)) {
|
||||||
|
@ -190,7 +190,7 @@ class Chart
|
||||||
$legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
|
$legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
|
||||||
break;
|
break;
|
||||||
case 'layout':
|
case 'layout':
|
||||||
$legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
|
$legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,7 +112,7 @@ class ZipStreamWrapper
|
||||||
*/
|
*/
|
||||||
public function url_stat() // @codingStandardsIgnoreLine
|
public function url_stat() // @codingStandardsIgnoreLine
|
||||||
{
|
{
|
||||||
return $this->statName($this->fileNameInArchive);
|
return $this->statName();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1837,7 +1837,7 @@ class Worksheet implements IComparable
|
||||||
{
|
{
|
||||||
$cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
|
$cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
|
||||||
|
|
||||||
return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
|
return $this->unprotectCells($cellRange);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue