aboutsummaryrefslogtreecommitdiffstats
path: root/poi-ooxml/src/main
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2021-07-24 14:15:08 +0000
committerPJ Fanning <fanningpj@apache.org>2021-07-24 14:15:08 +0000
commit86794884586023d05dd94598e60917cb2ca9ff7c (patch)
tree0f27e2369fabb031fcdd546dffba2fb538815b22 /poi-ooxml/src/main
parent4f1f2c9f80ccbd8722f9109321a311c0901bc55b (diff)
downloadpoi-86794884586023d05dd94598e60917cb2ca9ff7c.tar.gz
poi-86794884586023d05dd94598e60917cb2ca9ff7c.zip
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
Diffstat (limited to 'poi-ooxml/src/main')
-rw-r--r--poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java11
1 files 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<XSSFRow> {
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<XSSFRow> {
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?