Xlsx, fix the user property value analysis (#1898)

relocation of configuration method "getReportDesignConfiguration()"
eclipse-birt · Sep 7, 2024 · d45eaab · d45eaab
1 parent e61ee04
commit d45eaab
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/....spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/EmitterServices.java b/....spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/EmitterServices.java
@@ -124,14 +124,14 @@ public static boolean booleanOption(ITaskOption options, IReportContent reportCo
 			value = options.getOption(name);
 		}
 
-		if (value != null) {
-			result = booleanOption(value, defaultValue);
-		}
-
 		if (reportContent != null && value == null) {
 			value = getReportDesignConfiguration(reportContent, name);
 		}
 
+		if (value != null) {
+			result = booleanOption(value, defaultValue);
+		}
+
 		return result;
 	}
 
@@ -183,14 +183,14 @@ public static String stringOption(ITaskOption options, IContent birtContent, Str
 			value = options.getOption(name);
 		}
 
-		if (value != null) {
-			result = value.toString();
-		}
-
 		if (birtContent != null && birtContent.getReportContent() != null && value == null) {
 			value = getReportDesignConfiguration(birtContent.getReportContent(), name);
 		}
 
+		if (value != null) {
+			result = value.toString();
+		}
+
 		return result;
 	}
 
@@ -223,14 +223,14 @@ public static String stringOption(ITaskOption options, IReportContent reportCont
 			value = options.getOption(name);
 		}
 
-		if (value != null) {
-			result = value.toString();
-		}
-
 		if (reportContent != null && value == null) {
 			value = getReportDesignConfiguration(reportContent, name);
 		}
 
+		if (value != null) {
+			result = value.toString();
+		}
+
 		return result;
 	}