Skip to content

Commit

Permalink
Merge pull request #3917 from alibaba/bugfix
Browse files Browse the repository at this point in the history
* 兼容某些特殊的xls: 修改了内置的样式导致判断样式错误
  • Loading branch information
zhuangjiaju authored Aug 6, 2024
2 parents 3a1db02 + e2f302f commit 802c86f
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
**/
public class BuiltinFormats {

private static final String RESERVED = "reserved-";

public static short GENERAL = 0;

public static final String[] BUILTIN_FORMATS_ALL_LANGUAGES = {
Expand Down Expand Up @@ -491,7 +493,7 @@ public static String getBuiltinFormat(Short index, String defaultFormat, Locale
}

// In other cases, give priority to using the externally provided format
if (!StringUtils.isEmpty(defaultFormat) && !defaultFormat.startsWith("reserved-")) {
if (!StringUtils.isEmpty(defaultFormat) && !defaultFormat.startsWith(RESERVED)) {
return defaultFormat;
}

Expand Down

0 comments on commit 802c86f

Please sign in to comment.