From: Dominik Stadler <centic@apache.org>
Date: Mon, 11 Apr 2022 13:51:26 +0000 (+0000)
Subject: Missing font-system can throw two other types of exception
X-Git-Tag: REL_5_2_3~359
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ac26e7b1d8698f402dc156c6ad1c97b539d4d8b;p=poi.git

Missing font-system can throw two other types of exception

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

diff --git a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
index ebe20471c6..5ade711dee 100644
--- a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
@@ -297,7 +297,7 @@ public class SheetUtil {
         try {
             TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
             return (int) layout.getAdvance();
-        } catch (UnsatisfiedLinkError e) {
+        } catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError e) {
             if (ignoreMissingFontSystem) {
                 return DEFAULT_CHAR_WIDTH;
             }