Skip to content

fix for #651 #654

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

Closed
ianscriven wants to merge 1 commit into from
Closed

fix for #651 #654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions vaadin-spreadsheet/src/main/java/com/vaadin/addon/spreadsheet/CellValueManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,14 +1156,17 @@ protected void updateMarkedCellValues() {

// update all cached formula cell values on client side, because they
// might have changed. also make sure all marked cells are updated
Iterator<Row> rows = sheet.rowIterator();

// iterate from bottom to top, right to left, so that conditional
// formatting isn't evaluated before the cell value (due to border
// locations)
spreadsheet.getConditionalFormatter().evaluateBatch(formatter -> {
while (rows.hasNext()) {
final Row r = rows.next();
final Iterator<Cell> cells = r.cellIterator();
while (cells.hasNext()) {
final Cell cell = cells.next();
int rowIndex = cell.getRowIndex();
for (int rowIndex = sheet.getLastRowNum(); rowIndex >= 0; rowIndex--) {
final Row r = sheet.getRow(rowIndex);
if (r == null) continue; // skip null rows
for (int colIndex = r.getLastCellNum(); colIndex >= 0; colIndex--) {
final Cell cell = r.getCell(colIndex);
if (cell == null) continue; // skip null cells
int columnIndex = cell.getColumnIndex();
final String key = SpreadsheetUtil.toKey(columnIndex + 1,
rowIndex + 1);
Expand Down