Skip to content

Fixing row and column tracking when there are blank cells #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lsergio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing row and column tracking when there are blank cells #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
716caad
Fixing row and column tracking when there are blank cells
lsergio Dec 3, 2025
dc80b07
Adding test case
lsergio Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions fastexcel-reader/src/main/java/org/dhatim/fastexcel/reader/RowSpliterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@
*/
package org.dhatim.fastexcel.reader;

import javax.xml.stream.XMLStreamException;
import static org.dhatim.fastexcel.reader.DefaultXMLInputFactory.factory;

import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Spliterator;
import java.util.function.Consumer;
import java.util.function.Function;

import static org.dhatim.fastexcel.reader.DefaultXMLInputFactory.factory;
import javax.xml.stream.XMLStreamException;

class RowSpliterator implements Spliterator<Row> {

Expand Down Expand Up @@ -85,7 +92,7 @@ private Row next() throws XMLStreamException {
}

int trackedColIndex = 0;
int rowIndex = getRowIndexWithFallback(++trackedRowIndex);
int rowIndex = getRowIndexWithFallback(trackedRowIndex);
boolean isHidden = "1".equals(r.getAttribute("hidden"));

List<Cell> cells = new ArrayList<>(rowCapacity);
Expand All @@ -98,11 +105,14 @@ private Row next() throws XMLStreamException {

Cell cell = parseCell(trackedColIndex++);
CellAddress addr = cell.getAddress();
// we may have to adjust because we may have skipped blanks
trackedColIndex = addr.getColumn() + 1;
ensureSize(cells, addr.getColumn() + 1);

cells.set(addr.getColumn(), cell);
physicalCellCount++;
}
trackedRowIndex++;
rowCapacity = Math.max(rowCapacity, cells.size());
return new Row(rowIndex, physicalCellCount, cells, isHidden);
}
Expand All @@ -112,15 +122,15 @@ private int getRowIndexWithFallback(int fallbackRowIndex) {
return rowIndexOrNull != null ? rowIndexOrNull : fallbackRowIndex;
}

private CellAddress getCellAddressWithFallback(int trackedColIndex) {
private CellAddress getCellAddressWithFallback(int trackedColIndex, int trackedRowIndex) {
String cellRefOrNull = r.getAttribute("r");
return cellRefOrNull != null ?
new CellAddress(cellRefOrNull) :
new CellAddress(trackedRowIndex, trackedColIndex);
}

private Cell parseCell(int trackedColIndex) throws XMLStreamException {
CellAddress addr = getCellAddressWithFallback(trackedColIndex);
CellAddress addr = getCellAddressWithFallback(trackedColIndex, trackedRowIndex);
String type = r.getOptionalAttribute("t").orElse("n");
String styleString = r.getAttribute("s");
String formatId = null;
Expand Down Expand Up @@ -192,7 +202,7 @@ private Cell parseOther(CellAddress addr, String type, String dataFormatId, Stri
if (formula == null && value == null && definedType == CellType.NUMBER) {
return new Cell(workbook, CellType.EMPTY, null, addr, null, rawValue);
} else {
CellType cellType = (formula != null) ? CellType.FORMULA : definedType;
CellType cellType = formula != null ? CellType.FORMULA : definedType;
return new Cell(workbook, cellType, value, addr, formula, rawValue, dataFormatId, dataFormatString);
}
}
Expand All @@ -209,7 +219,7 @@ private String parseSharedFormula(Integer si, CellAddress addr) {
* @see <a href="https://github.com/qax-os/excelize/blob/master/cell.go">here</a>
*/
private String parseSharedFormula(Integer dCol, Integer dRow, String baseFormula) {
String res = "";
StringBuilder res = new StringBuilder();
Copy link
Collaborator

@rzymek rzymek Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

int start = 0;
boolean stringLiteral = false;
for (int end = 0; end < baseFormula.length(); end++) {
Expand All @@ -222,7 +232,7 @@ private String parseSharedFormula(Integer dCol, Integer dRow, String baseFormula
}
if (c >= 'A' && c <= 'Z' || c == '$') {

res += baseFormula.substring(start, end);
res.append(baseFormula.substring(start, end));
start = end;
end++;
boolean foundNum = false;
Expand All @@ -240,17 +250,17 @@ private String parseSharedFormula(Integer dCol, Integer dRow, String baseFormula
}
if (foundNum) {
String cellID = baseFormula.substring(start, end);
res += shiftCell(cellID, dCol, dRow);
res.append(shiftCell(cellID, dCol, dRow));
start = end;
}
}
}

if (start < baseFormula.length()) {
res += baseFormula.substring(start);
res.append(baseFormula.substring(start));
}

return res;
return res.toString();
}

/**
Expand Down
28 changes: 28 additions & 0 deletions fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/RowSpliteratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package org.dhatim.fastexcel.reader;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.InputStream;

import org.junit.jupiter.api.Test;

public class RowSpliteratorTest {

@Test
void testBlankCells() throws Exception {
InputStream is = Resources.open("/xml/blank_cells.xml");
RowSpliterator it = new RowSpliterator(null, is);
it.tryAdvance(row -> {
assertEquals(8, row.getCellCount());
Cell cell = row.getCell(7);
assertEquals("H1", cell.getAddress().toString());
});
it.tryAdvance(row -> {
assertEquals(8, row.getCellCount());
Cell cell = row.getCell(7);
assertEquals("H2", cell.getAddress().toString());
});
}

}

48 changes: 48 additions & 0 deletions fastexcel-reader/src/test/resources/xml/blank_cells.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<sheetData>
<row>
<c t="b">
<v>1</v>
</c>
<c r="C1" t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
</row>
<row>
<c t="b">
<v>1</v>
</c>
<c r="C2" t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
<c t="b">
<v>1</v>
</c>
</row>
</sheetData>