alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change how ReadFilters are interpreted

This commit is contained in:
Alex Wright 2020-12-13 15:29:18 +01:00
parent 37bf44e9db
commit f366c0f257
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
View File

@ -121,13 +121,16 @@ class ColumnAndRowAttributes extends BaseParserClass
private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, array $rowsAttributes) private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, array $rowsAttributes)
{ {
if (empty($rowAttributes)) {
return false;
}
foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) { foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) { if ($readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
return true; return false;
} }
} }
return false; return true;
} }
private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readDataOnly) private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readDataOnly)
@ -173,13 +176,16 @@ class ColumnAndRowAttributes extends BaseParserClass
private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $columnsAttributes) private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $columnsAttributes)
{ {
if (empty($columnAttributes)) {
return false;
}
foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) { foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) { if ($readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
return true; return false;
} }
} }
return false; return true;
} }
private function readRowAttributes(SimpleXMLElement $worksheetRow, $readDataOnly) private function readRowAttributes(SimpleXMLElement $worksheetRow, $readDataOnly)