svn commit: r1907443 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java

[fanningpj]

Author: fanningpj
Date: Sun Feb  5 20:34:19 2023
New Revision: 1907443

URL: http://svn.apache.org/viewvc?rev=1907443&view=rev
Log:
[bug-65260] partial revert of recent changes

Modified:
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1907443&r1=1907442&r2=1907443&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java 
(original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java 
Sun Feb  5 20:34:19 2023
@@ -63,8 +63,8 @@ public class SXSSFSheet implements Sheet
         setRandomAccessWindowSize(randomAccessWindowSize);
         try {
             _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
-        } catch (Throwable t) {
-            LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly 
due to fonts not being installed in your OS", t);
+        } catch (UnsatisfiedLinkError | InternalError e) {
+            LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly 
due to fonts not being installed in your OS", e);
         }
     }
 
@@ -96,8 +96,8 @@ public class SXSSFSheet implements Sheet
         setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize());
         try {
             _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
-        } catch (Throwable t) {
-            LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly 
due to fonts not being installed in your OS", t);
+        } catch (UnsatisfiedLinkError | InternalError e) {
+            LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly 
due to fonts not being installed in your OS", e);
         }
     }
 

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java?rev=1907443&r1=1907442&r2=1907443&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java Sun Feb  
5 20:34:19 2023
@@ -300,12 +300,12 @@ public class SheetUtil {
         try {
             TextLayout layout = new TextLayout(str.getIterator(), 
fontRenderContext);
             return (int) layout.getAdvance();
-        } catch (Throwable t) {
+        } catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError 
e) {
             if (ignoreMissingFontSystem) {
                 return DEFAULT_CHAR_WIDTH;
             }
 
-            throw t;
+            throw e;
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org