From 86794884586023d05dd94598e60917cb2ca9ff7c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 24 Jul 2021 14:15:08 +0000 Subject: [PATCH] handle case where row nums are the same git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891776 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/xssf/usermodel/XSSFRow.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java index 4c4f6a831b..5f640b000d 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java @@ -673,8 +673,7 @@ public class XSSFRow implements Row, Comparable { setHeight((short)-1); } - } - else { + } else { for (final Cell c : srcRow) { final XSSFCell destCell = createCell(c.getColumnIndex()); destCell.copyCellFrom(c, policy); @@ -686,11 +685,9 @@ public class XSSFRow implements Row, Comparable { final int destRowNum = getRowNum(); final int rowDifference = destRowNum - srcRowNum; - if (rowDifference != 0) { - final FormulaShifter formulaShifter = FormulaShifter.createForRowCopy(sheetIndex, sheetName, srcRowNum, srcRowNum, rowDifference, SpreadsheetVersion.EXCEL2007); - final XSSFRowShifter rowShifter = new XSSFRowShifter(_sheet); - rowShifter.updateRowFormulas(this, formulaShifter); - } + final FormulaShifter formulaShifter = FormulaShifter.createForRowCopy(sheetIndex, sheetName, srcRowNum, srcRowNum, rowDifference, SpreadsheetVersion.EXCEL2007); + final XSSFRowShifter rowShifter = new XSSFRowShifter(_sheet); + rowShifter.updateRowFormulas(this, formulaShifter); // Copy merged regions that are fully contained on the row // FIXME: is this something that rowShifter could be doing?