Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-65227] add NPE guard in SheetUtil. Thanks to Petr Blaha 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-04-09 08:21:13 +00:00
parent 30d8d17735
commit 0c3aa44d36
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
View File

@ -160,18 +160,20 @@ public class SheetUtil {
double width = -1; double width = -1;
if (cellType == CellType.STRING) { if (cellType == CellType.STRING) {
RichTextString rt = cell.getRichStringCellValue(); RichTextString rt = cell.getRichStringCellValue();
String[] lines = rt.getString().split("\\n"); if (rt != null && rt.getString() != null) {
for (String line : lines) { String[] lines = rt.getString().split("\\n");
String txt = line + defaultChar; for (String line : lines) {
String txt = line + defaultChar;
AttributedString str = new AttributedString(txt); AttributedString str = new AttributedString(txt);
copyAttributes(font, str, 0, txt.length()); copyAttributes(font, str, 0, txt.length());
/*if (rt.numFormattingRuns() > 0) { /*if (rt.numFormattingRuns() > 0) {
// TODO: support rich text fragments // TODO: support rich text fragments
}*/ }*/
width = getCellWidth(defaultCharWidth, colspan, style, width, str); width = getCellWidth(defaultCharWidth, colspan, style, width, str);
}
} }
} else { } else {
String sval = null; String sval = null;