lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化合并单元格读取

Browse Source
This commit is contained in:
Looly 2022-10-09 19:07:19 +08:00
parent 7c2ce9731e
commit da21e6b071
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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）

5
hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
View File

@ -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());
}