From 6351fe2c18acd9c42fc19148721a68b5b00317fc Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Wed, 15 Sep 2021 22:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=A1=8C=E9=AB=98=E7=9A=84=E9=97=AE=E9=A2=98=20[Issue=20#1869]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alibaba/excel/write/executor/ExcelWriteFillExecutor.java  | 4 ++--
 .../poi/hssf/usermodel/{PoiHssfUtils.java => PoiUtils.java}   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/org/apache/poi/hssf/usermodel/{PoiHssfUtils.java => PoiUtils.java} (96%)

diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
index 9041419a..e7fdcd87 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
@@ -28,7 +28,7 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.hssf.usermodel.PoiHssfUtils;
+import org.apache.poi.hssf.usermodel.PoiUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
@@ -354,7 +354,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             return;
         }
         // fix https://github.com/alibaba/easyexcel/issues/1869
-        if (isOriginalCell && PoiHssfUtils.customHeight(row)) {
+        if (isOriginalCell && PoiUtils.customHeight(row)) {
             collectionRowHeightCache.put(currentUniqueDataFlag, row.getHeight());
             return;
         }
diff --git a/src/main/java/org/apache/poi/hssf/usermodel/PoiHssfUtils.java b/src/main/java/org/apache/poi/hssf/usermodel/PoiUtils.java
similarity index 96%
rename from src/main/java/org/apache/poi/hssf/usermodel/PoiHssfUtils.java
rename to src/main/java/org/apache/poi/hssf/usermodel/PoiUtils.java
index 80f7f3b8..6708e63b 100644
--- a/src/main/java/org/apache/poi/hssf/usermodel/PoiHssfUtils.java
+++ b/src/main/java/org/apache/poi/hssf/usermodel/PoiUtils.java
@@ -10,7 +10,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
  *
  * @author Jiaju Zhuang
  */
-public class PoiHssfUtils {
+public class PoiUtils {
 
     /**
      * Whether to customize the height