Author: centic
Date: Mon Dec 26 16:15:44 2022
New Revision: 1906218
URL: http://svn.apache.org/viewvc?rev=1906218&view=rev
Log:
Bug 65260: Fix how we ignore errors when fonts are not installed
The implementation via bug 66230 was not fully working due to the
caught exception.
Also add this to the 2nd constructor as well.
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.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=1906218&r1=1906217&r2=1906218&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
Mon Dec 26 16:15:44 2022
@@ -62,7 +62,11 @@ public class SXSSFSheet implements Sheet
_sh = xSheet;
calculateLeftAndRightMostColumns(xSheet);
setRandomAccessWindowSize(randomAccessWindowSize);
- _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
+ try {
+ _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
+ } catch (InternalError e) {
+ LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly
due to fonts not being installed in your OS", e);
+ }
}
private void calculateLeftAndRightMostColumns(XSSFSheet xssfSheet) {
@@ -93,7 +97,7 @@ public class SXSSFSheet implements Sheet
setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize());
try {
_autoSizeColumnTracker = new AutoSizeColumnTracker(this);
- } catch (Exception e) {
+ } catch (InternalError e) {
LOG.atWarn().log("Failed to create AutoSizeColumnTracker, possibly
due to fonts not being installed in your OS", e);
}
}
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java?rev=1906218&r1=1906217&r2=1906218&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
Mon Dec 26 16:15:44 2022
@@ -43,11 +43,10 @@ import org.junit.jupiter.api.Test;
/**
* Tests the auto-sizing behaviour of {@link SXSSFSheet} when not all
* rows fit into the memory window size etc.
- *
+ * <p>
* see Bug #57450 which reported the original misbehaviour
*/
class TestAutoSizeColumnTracker {
-
private SXSSFSheet sheet;
private SXSSFWorkbook workbook;
private AutoSizeColumnTracker tracker;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
