try to fix HSSF tests

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902635 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
index bc47b10da0d2e667edba355bebce717ee16cf225..e509dd2aafdffd7cb5413c669cc23117d4c63eaa 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
@@ -545,25 +545,24 @@ public final class CellUtil {
         style.setDataFormat(getShort(properties, DATA_FORMAT));
         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 backgroundFillColor = getColor(properties, FILL_BACKGROUND_COLOR_COLOR);
         if (foregroundFillColor != null) {
             try {
                 style.setFillForegroundColor(foregroundFillColor);
             } 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) {
             try {
                 style.setFillBackgroundColor(backgroundFillColor);
             } 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)));