From da21e6b0717eee6be99df283a44f9194133a024b Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Sun, 9 Oct 2022 19:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                                 | 1 +
 .../src/main/java/cn/hutool/poi/excel/cell/CellUtil.java     | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31a3b8308..65ea83b52 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * 【core   】     DateUtil增加isLastDayOfMonth、getLastDayOfMonth方法（pr#824@Gitee）
 * 【core   】     AnnotationUtil类支持Lambda获取某注解属性值（pr#827@Gitee）
 * 【core   】     CharUtil.isBlank添加Hangul Filler字符（issue#I5UGSQ@Gitee）
+* 【poi    】     优化合并单元格读取（issue#I5UJZ1@Gitee）
 
 ### 🐞Bug修复
 * 【poi    】     修复ExcelReader读取只有标题行报错问题（issue#I5U1JA@Gitee）
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
index 8c4f4d4cf..23a334846 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
@@ -479,10 +479,7 @@ public class CellUtil {
 	 * @since 5.4.5
 	 */
 	private static Cell getCellIfMergedRegion(Sheet sheet, int x, int y) {
-		final int sheetMergeCount = sheet.getNumMergedRegions();
-		CellRangeAddress ca;
-		for (int i = 0; i < sheetMergeCount; i++) {
-			ca = sheet.getMergedRegion(i);
+		for (final CellRangeAddress ca : sheet.getMergedRegions()) {
 			if (ca.isInRange(y, x)) {
 				return SheetUtil.getCell(sheet, ca.getFirstRow(), ca.getFirstColumn());
 			}