Author: fanningpj
Date: Sat Jan 11 14:23:49 2025
New Revision: 1923071
URL: http://svn.apache.org/viewvc?rev=1923071&view=rev
Log:
reimplement SXSSFSheet arbitrary extra width support (5.4.0 code does not work)
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
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/TestSXSSFSheet.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java?rev=1923071&r1=1923070&r2=1923071&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
Sat Jan 11 14:23:49 2025
@@ -392,9 +392,9 @@ import org.apache.poi.util.Internal;
*/
private void updateColumnWidth(final Cell cell, final ColumnWidthPair
pair) {
final double unmergedWidth =
- SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter,
false) + arbitraryExtraWidth;
+ SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter,
false);
final double mergedWidth =
- SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter,
true) + arbitraryExtraWidth;
+ SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter,
true);
pair.setMaxColumnWidths(unmergedWidth, mergedWidth);
}
}
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=1923071&r1=1923070&r2=1923071&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
Sat Jan 11 14:23:49 2025
@@ -1666,7 +1666,8 @@ public class SXSSFSheet implements Sheet
}
// get the best-fit width of rows currently in the random access window
- final int activeWidth = (int) (256 * SheetUtil.getColumnWidth(this,
column, useMergedCells));
+ final double w1 = SheetUtil.getColumnWidth(this, column,
useMergedCells);
+ final int activeWidth = (int) ((256 * w1) + getArbitraryExtraWidth());
// the best-fit width for both flushed rows and random access window
rows
// flushedWidth or activeWidth may be negative if column contains only
blank cells
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java?rev=1923071&r1=1923070&r2=1923071&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
Sat Jan 11 14:23:49 2025
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
@@ -45,7 +46,7 @@ public final class TestSXSSFSheet extend
@AfterEach
- void tearDown(){
+ void tearDown() {
SXSSFITestDataProvider.instance.cleanup();
}
@@ -84,9 +85,9 @@ public final class TestSXSSFSheet extend
}
/**
- * Bug 35084: cloning cells with formula
- *
- * The test is disabled because cloning of sheets is not supported in
SXSSF
+ * Bug 35084: cloning cells with formula
+ * <p>
+ * The test is disabled because cloning of sheets is not supported in SXSSF
*/
@Override
@Test
@@ -193,9 +194,9 @@ public final class TestSXSSFSheet extend
//one level
sheet.groupRow(9, 10);
- try(UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
workbook.write(bos);
- try(XSSFWorkbook xssfWorkbook = new
XSSFWorkbook(bos.toInputStream())) {
+ try (XSSFWorkbook xssfWorkbook = new
XSSFWorkbook(bos.toInputStream())) {
XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
CTRow ctrow = xssfSheet.getRow(9).getCTRow();
@@ -223,9 +224,9 @@ public final class TestSXSSFSheet extend
//two level
sheet.groupRow(10, 13);
- try(UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
workbook.write(bos);
- try(XSSFWorkbook xssfWorkbook = new
XSSFWorkbook(bos.toInputStream())) {
+ try (XSSFWorkbook xssfWorkbook = new
XSSFWorkbook(bos.toInputStream())) {
XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
CTRow ctrow = xssfSheet.getRow(9).getCTRow();
@@ -242,4 +243,43 @@ public final class TestSXSSFSheet extend
}
}
}
+
+ @Test
+ void autosizeWithArbitraryExtraWidth() throws IOException {
+ final int extra = 100;
+ final String longText =
+ "This is a very long text that will exceed default column
width for sure.";
+ int width0, width1 = 0;
+ try (SXSSFWorkbook workbook0 = new SXSSFWorkbook()) {
+ SXSSFSheet sheet = workbook0.createSheet();
+ sheet.trackColumnForAutoSizing(0);
+
+ SXSSFRow row = sheet.createRow(0);
+ row.createCell(0).setCellValue(longText);
+ sheet.autoSizeColumn(0);
+
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+ workbook0.write(bos);
+ }
+ width0 = sheet.getColumnWidth(0);
+ }
+
+ try (SXSSFWorkbook workbook1 = new SXSSFWorkbook()) {
+ SXSSFSheet sheet = workbook1.createSheet();
+ sheet.setArbitraryExtraWidth(extra);
+ sheet.trackColumnForAutoSizing(0);
+
+ SXSSFRow row = sheet.createRow(0);
+ row.createCell(0).setCellValue(longText);
+ sheet.autoSizeColumn(0);
+
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+ workbook1.write(bos);
+ }
+ width1 = sheet.getColumnWidth(0);
+ }
+
+ assertEquals(width0 + extra, width1);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
