From: PJ Fanning <fanningpj@apache.org>
Date: Sat, 24 Jul 2021 08:27:49 +0000 (+0000)
Subject: partially undo change
X-Git-Tag: REL_5_1_0~122
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c8b475a9c2553d197748320bb4073670bf112f50;p=poi.git

partially undo change

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891764 13f79535-47bb-0310-9956-ffa450edef68
---

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 d0aa2ff867..3992d59139 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
@@ -34,7 +34,6 @@ import org.apache.poi.ss.usermodel.FormulaError;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.helpers.RowShifter;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellUtil;
 import org.apache.poi.util.Beta;
 import org.apache.poi.util.Internal;
 import org.apache.poi.xssf.model.StylesTable;
@@ -651,7 +650,8 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
             // srcRow is blank. Overwrite cells with blank values, blank styles, etc per cell copy policy
             for (Cell destCell : this) {
                 final XSSFCell srcCell = null;
-                CellUtil.copyCell(srcCell, destCell, policy);
+                // FIXME: remove type casting when copyCellFrom(Cell, CellCopyPolicy) is added to Cell interface
+                ((XSSFCell)destCell).copyCellFrom(srcCell, policy);
             }
 
             if (policy.isCopyMergedRegions()) {