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

try to fix HSSF tests 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902635 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-07-10 14:38:04 +00:00
parent 69036c64ea
commit 5386fe171d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,25 +545,24 @@ public final class CellUtil {
style.setDataFormat(getShort(properties, DATA_FORMAT)); style.setDataFormat(getShort(properties, DATA_FORMAT));
style.setFillPattern(getFillPattern(properties, FILL_PATTERN)); style.setFillPattern(getFillPattern(properties, FILL_PATTERN));
style.setFillForegroundColor(getShort(properties, FILL_FOREGROUND_COLOR));
style.setFillBackgroundColor(getShort(properties, FILL_BACKGROUND_COLOR));
Color foregroundFillColor = getColor(properties, FILL_FOREGROUND_COLOR_COLOR); Color foregroundFillColor = getColor(properties, FILL_FOREGROUND_COLOR_COLOR);
Color backgroundFillColor = getColor(properties, FILL_BACKGROUND_COLOR_COLOR); Color backgroundFillColor = getColor(properties, FILL_BACKGROUND_COLOR_COLOR);
if (foregroundFillColor != null) { if (foregroundFillColor != null) {
try { try {
style.setFillForegroundColor(foregroundFillColor); style.setFillForegroundColor(foregroundFillColor);
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
style.setFillForegroundColor(getShort(properties, FILL_FOREGROUND_COLOR)); LOGGER.atDebug().log("Mismatched FillForegroundColor instance used", iae);
} }
} else {
style.setFillForegroundColor(getShort(properties, FILL_FOREGROUND_COLOR));
} }
if (backgroundFillColor != null) { if (backgroundFillColor != null) {
try { try {
style.setFillBackgroundColor(backgroundFillColor); style.setFillBackgroundColor(backgroundFillColor);
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
style.setFillBackgroundColor(getShort(properties, FILL_BACKGROUND_COLOR)); LOGGER.atDebug().log("Mismatched FillBackgroundColor instance used", iae);
} }
} else {
style.setFillBackgroundColor(getShort(properties, FILL_BACKGROUND_COLOR));
} }
style.setFont(workbook.getFontAt(getInt(properties, FONT))); style.setFont(workbook.getFontAt(getInt(properties, FONT)));