ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-10-09 19:12:02 +08:00
parent ee3022b4b3
commit 5fceca0bbc
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -3,15 +3,14 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 6.0.0.M1 (2022-08-27) # 6.0.0.M1 (2022-10-09)
### 计划实现 ### 计划实现
* 【poi 】 PDF相关（基于PdfBox） * 【poi 】 PDF相关（基于PdfBox）
* 【poi 】 HTML、DOCX转换相关 * 【poi 】 HTML、DOCX转换相关
* 【poi 】 Markdown相关（如HTML转换等），基于commonmark-java * 【poi 】 Markdown相关（如HTML转换等），基于commonmark-java
* 【db 】 增加DDL封装 * 【db 】 增加DDL封装
* 【json 】 实现自定义的类型转换，不影响全局的转换器 * 【poi 】 CellUtil.getCellIfMergedRegion考虑添加缓存支持，增加最大和最小范围判断，减少遍历
* 【core 】 Functional接口重新定义
### ❌不兼容特性 ### ❌不兼容特性

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

@ -466,10 +466,7 @@ public class CellUtil {
* @since 5.4.5 * @since 5.4.5
*/ */
private static Cell getCellIfMergedRegion(final Sheet sheet, final int x, final int y) { private static Cell getCellIfMergedRegion(final Sheet sheet, final int x, final int y) {
final int sheetMergeCount = sheet.getNumMergedRegions(); for (final CellRangeAddress ca : sheet.getMergedRegions()) {
CellRangeAddress ca;
for (int i = 0; i < sheetMergeCount; i++) {
ca = sheet.getMergedRegion(i);
if (ca.isInRange(y, x)) { if (ca.isInRange(y, x)) {
return SheetUtil.getCell(sheet, ca.getFirstRow(), ca.getFirstColumn()); return SheetUtil.getCell(sheet, ca.getFirstRow(), ca.getFirstColumn());
} }