mirror of https://github.com/apache/poi.git
[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:
parent
30d8d17735
commit
0c3aa44d36
|
@ -160,18 +160,20 @@ public class SheetUtil {
|
|||
double width = -1;
|
||||
if (cellType == CellType.STRING) {
|
||||
RichTextString rt = cell.getRichStringCellValue();
|
||||
String[] lines = rt.getString().split("\\n");
|
||||
for (String line : lines) {
|
||||
String txt = line + defaultChar;
|
||||
if (rt != null && rt.getString() != null) {
|
||||
String[] lines = rt.getString().split("\\n");
|
||||
for (String line : lines) {
|
||||
String txt = line + defaultChar;
|
||||
|
||||
AttributedString str = new AttributedString(txt);
|
||||
copyAttributes(font, str, 0, txt.length());
|
||||
AttributedString str = new AttributedString(txt);
|
||||
copyAttributes(font, str, 0, txt.length());
|
||||
|
||||
/*if (rt.numFormattingRuns() > 0) {
|
||||
// TODO: support rich text fragments
|
||||
}*/
|
||||
/*if (rt.numFormattingRuns() > 0) {
|
||||
// TODO: support rich text fragments
|
||||
}*/
|
||||
|
||||
width = getCellWidth(defaultCharWidth, colspan, style, width, str);
|
||||
width = getCellWidth(defaultCharWidth, colspan, style, width, str);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
String sval = null;
|
||||
|
|
Loading…
Reference in New Issue