Not relevant parameters when calling functions

This commit is contained in:
golodnyi 2016-12-09 09:56:59 +07:00 committed by Adrien Crivelli
parent c8a8fd2610
commit a6a709a4ba
7 changed files with 9 additions and 17 deletions

View File

@ -3532,7 +3532,7 @@ class Calculation
$result = '#VALUE!';
}
} 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));
$stack->push('Value', $result);

View File

@ -830,7 +830,7 @@ class JpGraph
$this->renderContourChart($groupCount, $dimensions);
break;
case 'stockChart':
$this->renderStockChart($groupCount, $dimensions);
$this->renderStockChart($groupCount);
break;
default:
echo $chartType . ' is not yet implemented<br />';

View File

@ -4431,7 +4431,7 @@ class Xls extends BaseReader implements IReader
if (!$this->readDataOnly) {
// offset: 0; size: 8; cell range address of all cells containing this hyperlink
try {
$cellRange = $this->readBIFF8CellRangeAddressFixed($recordData, 0, 8);
$cellRange = $this->readBIFF8CellRangeAddressFixed($recordData);
} catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
return;
}

View File

@ -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
$rels = simplexml_load_string(
$this->securityScan(
$this->getFromZipArchive($zip, '_rels/.rels'),
'SimpleXMLElement',
\PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
)
$this->securityScan($this->getFromZipArchive($zip, '_rels/.rels'))
); //~ http://schemas.openxmlformats.org/package/2006/relationships");
foreach ($rels->Relationship as $rel) {
switch ($rel['Type']) {
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
$xmlWorkbook = simplexml_load_string(
$this->securityScan(
$this->getFromZipArchive($zip, "{$rel['Target']}"),
'SimpleXMLElement',
\PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
)
$this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}"))
); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
if ($xmlWorkbook->sheets) {

View File

@ -83,7 +83,7 @@ class Chart
foreach ($chartDetails as $chartDetailKey => $chartDetail) {
switch ($chartDetailKey) {
case 'layout':
$plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
$plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
break;
case 'catAx':
if (isset($chartDetail->title)) {
@ -190,7 +190,7 @@ class Chart
$legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
break;
case 'layout':
$legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
$legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
break;
}
}

View File

@ -112,7 +112,7 @@ class ZipStreamWrapper
*/
public function url_stat() // @codingStandardsIgnoreLine
{
return $this->statName($this->fileNameInArchive);
return $this->statName();
}
/**

View File

@ -1837,7 +1837,7 @@ class Worksheet implements IComparable
{
$cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
return $this->unprotectCells($cellRange);
}
/**