Merge pull request PHPOffice#4803 from QDenka/fix/ods-read-filter-repeated-columns

Fix ODS reader column misalignment with read filter and number-columns-repeated

Author: oleibman

CHANGELOG.md

@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). Thia is a
 - Option to whitelist external images. [PR #4793](https://github.com/PHPOffice/PhpSpreadsheet/pull/4793)
 - Handle Unions as Function Arguments. [Issue #4656](https://github.com/PHPOffice/PhpSpreadsheet/issues/4656) [Issue #316](https://github.com/PHPOffice/PhpSpreadsheet/issues/316) [Issue #503](https://github.com/PHPOffice/PhpSpreadsheet/issues/503) [PR #4657](https://github.com/PHPOffice/PhpSpreadsheet/pull/4657)
 - Unexpected Behavior of CONCATENATE. [Issue #4061](https://github.com/PHPOffice/PhpSpreadsheet/issues/4061) [PR #4797](https://github.com/PHPOffice/PhpSpreadsheet/pull/4797)
+- Ods Reader column misalignment. [Issue #4802](https://github.com/PHPOffice/PhpSpreadsheet/issues/4802) [PR #4803](https://github.com/PHPOffice/PhpSpreadsheet/pull/4803)
 - Image Css size in millimeters. [Issue #4800](https://github.com/PHPOffice/PhpSpreadsheet/issues/4800) [PR #4801](https://github.com/PHPOffice/PhpSpreadsheet/pull/4801)
 
 ## 2026-01-10 - 5.4.0

src/PhpSpreadsheet/Reader/Ods.php

@@ -573,18 +573,45 @@ private function processTableRow(
             if ($cellData instanceof DOMText) {
                 continue; // should just be whitespace
             }
+            if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
+            } else {
+                $colRepeats = 1;
+            }
+
+            // When a cell has number-columns-repeated, check if ANY column in the
+            // repeated range passes the read filter. If not, skip the entire group.
+            // If some columns pass, we need to fall through to the processing block
+            // which will handle per-column filtering.
             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-                if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
-                    $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
-                } else {
-                    $colRepeats = 1;
+                if ($colRepeats <= 1) {
+                    StringHelper::stringIncrement($columnID);
+
+                    continue;
                 }
 
+                // Check if any column within this repeated group passes the filter
+                $anyColumnPasses = false;
+                $tempCol = $columnID;
                 for ($i = 0; $i < $colRepeats; ++$i) {
-                    StringHelper::stringIncrement($columnID);
+                    if ($i > 0) {
+                        StringHelper::stringIncrement($tempCol);
+                    }
+                    if ($this->getReadFilter()->readCell($tempCol, $rowID, $worksheetName)) {
+                        $anyColumnPasses = true;
+
+                        break;
+                    }
                 }
 
-                continue;
+                if (!$anyColumnPasses) {
+                    for ($i = 0; $i < $colRepeats; ++$i) {
+                        StringHelper::stringIncrement($columnID);
+                    }
+
+                    continue;
+                }
+                // Fall through to process the cell, with per-column filter checks
             }
 
             // Initialize variables
@@ -763,18 +790,16 @@ private function processTableRow(
                 $cellDataFormula = FormulaTranslator::convertToExcelFormulaValue($cellDataFormula);
             }
 
-            if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
-                $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
-            } else {
-                $colRepeats = 1;
-            }
-
             if ($type !== null) { // @phpstan-ignore-line
                 for ($i = 0; $i < $colRepeats; ++$i) {
                     if ($i > 0) {
                         StringHelper::stringIncrement($columnID);
                     }
 
+                    if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+                        continue;
+                    }
+
                     if ($type !== DataType::TYPE_NULL) {
                         for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
                             $rID = $rowID + $rowAdjust;

tests/PhpSpreadsheetTests/Reader/Ods/RepeatedColumnsTest.php

@@ -32,4 +32,39 @@ public function readCell(string $columnAddress, int $row, string $worksheetName
         self::assertEquals('TestK', $worksheet->getCell('K1')->getValue());
         $spreadsheet->disconnectWorksheets();
     }
+
+    /**
+     * Test that read filter correctly handles cells with number-columns-repeated
+     * containing data, where some repeated columns pass the filter and others don't.
+     *
+     * @see https://github.com/PHPOffice/PhpSpreadsheet/issues/4802
+     */
+    public function testReadFilterWithRepeatedDataCells(): void
+    {
+        // The ODS file has: A=TestA, B-D=empty(repeated=3), E=TestE, F=empty,
+        // G=TestG, H-J=SameValue(repeated=3), K=TestK
+        $reader = new Ods();
+        $reader->setReadFilter(
+            new class () implements IReadFilter {
+                public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool
+                {
+                    return in_array($columnAddress, ['I', 'K'], true);
+                }
+            }
+        );
+        $spreadsheet = $reader->load('tests/data/Reader/Ods/RepeatedDataCells.ods');
+        $worksheet = $spreadsheet->getActiveSheet();
+
+        // I1 is part of a repeated cell group (H-J) with value "SameValue"
+        // The filter should correctly read I1 even though H (first in group) is not in the filter
+        self::assertEquals('SameValue', $worksheet->getCell('I1')->getValue());
+        self::assertEquals('TestK', $worksheet->getCell('K1')->getValue());
+
+        // Columns not in filter should not have data
+        self::assertNull($worksheet->getCell('A1')->getValue());
+        self::assertNull($worksheet->getCell('H1')->getValue());
+        self::assertNull($worksheet->getCell('J1')->getValue());
+
+        $spreadsheet->disconnectWorksheets();
+    }
 }