pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

nullSafeFormatProperties (#961)

Browse Source
This commit is contained in:
PJ Fanning 2025-12-05 10:51:57 +01:00 committed by GitHub
parent 57ffd3aa12
commit 6d6089eee5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -614,7 +614,7 @@ public final class CellUtil {
CellStyle originalStyle = cell.getCellStyle();
CellStyle newStyle = null;
EnumMap<CellPropertyType, Object> values = originalStyle.getFormatProperties();
EnumMap<CellPropertyType, Object> values = nullSafeFormatProperties(originalStyle);
if (properties.containsKey(CellPropertyType.FILL_FOREGROUND_COLOR_COLOR) && properties.get(CellPropertyType.FILL_FOREGROUND_COLOR_COLOR) == null) {
values.remove(CellPropertyType.FILL_FOREGROUND_COLOR);
}
@ -635,7 +635,7 @@ public final class CellUtil {
for (int i = 0; i < numberCellStyles; i++) {
CellStyle wbStyle = workbook.getCellStyleAt(i);
EnumMap<CellPropertyType, Object> wbStyleMap = wbStyle.getFormatProperties();
EnumMap<CellPropertyType, Object> wbStyleMap = nullSafeFormatProperties(wbStyle);
// the desired style already exists in the workbook. Use the existing style.
if (styleMapsMatch(wbStyleMap, values, disableNullColorCheck)) {
@ -653,6 +653,13 @@ public final class CellUtil {
cell.setCellStyle(newStyle);
}
// try to get format properties from CellStyle but the method may return null
// in some implementations, so we need to be null safe here
private static EnumMap<CellPropertyType, Object> nullSafeFormatProperties(CellStyle style) {
EnumMap<CellPropertyType, Object> props = style.getFormatProperties();
return props == null ? getFormatProperties(style) : props;
}
private static boolean styleMapsMatch(final Map<CellPropertyType, Object> newProps,
final Map<CellPropertyType, Object> storedProps, final boolean disableNullColorCheck) {
final EnumMap<CellPropertyType, Object> map1Copy = new EnumMap<>(newProps);
@ -888,7 +895,7 @@ public final class CellUtil {
if (src == null || dest == null) {
throw new IllegalArgumentException("Source and destination styles must not be null");
}
EnumMap<CellPropertyType, Object> properties = src.getFormatProperties();
EnumMap<CellPropertyType, Object> properties = nullSafeFormatProperties(src);
setFormatProperties(dest, destWorkbook, properties);
}