Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔨 修复 getRelativeRowIndex 转换int 可能会导致的空指针异常 #3616

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🔨 修复 getRelativeRowIndex 转换int 可能会导致的空指针异常 #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-core/src/main/java/com/alibaba/excel/write/style/row/AbstractRowHeightStyleStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public void afterRowDispose(RowWriteHandlerContext context) {
* @param row
* @param relativeRowIndex
*/
protected abstract void setHeadColumnHeight(Row row, int relativeRowIndex);
protected abstract void setHeadColumnHeight(Row row, Integer relativeRowIndex);

/**
* Sets the height of content
*
* @param row
* @param relativeRowIndex
*/
protected abstract void setContentColumnHeight(Row row, int relativeRowIndex);
protected abstract void setContentColumnHeight(Row row, Integer relativeRowIndex);

}
4 changes: 2 additions & 2 deletions ...el-core/src/main/java/com/alibaba/excel/write/style/row/SimpleRowHeightStyleStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ public SimpleRowHeightStyleStrategy(Short headRowHeight, Short contentRowHeight)
}

@Override
protected void setHeadColumnHeight(Row row, int relativeRowIndex) {
protected void setHeadColumnHeight(Row row, Integer relativeRowIndex) {
if (headRowHeight != null) {
row.setHeightInPoints(headRowHeight);
}
}

@Override
protected void setContentColumnHeight(Row row, int relativeRowIndex) {
protected void setContentColumnHeight(Row row, Integer relativeRowIndex) {
if (contentRowHeight != null) {
row.setHeightInPoints(contentRowHeight);
}
Expand Down