Improve the xlsx column auto fit (#1553) (#1557)

eclipse-birt · Jan 27, 2024 · 7cd02fe · 7cd02fe
1 parent f32bef1
commit 7cd02fe
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...tters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/AbstractRealTableHandler.java b/...tters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/AbstractRealTableHandler.java
@@ -167,15 +167,18 @@ public void endTable(HandlerState state, ITableContent table) throws BirtExcepti
 					double calcWidth = SheetUtil.getColumnWidth(filteredSheet, col, false);
 
 					if (calcWidth > 1.0) {
-						calcWidth *= 256;
-						int maxColumnWidth = 255 * 256; // The maximum column width for an individual cell is 255
+						state.currentSheet.autoSizeColumn(col, true);
+						calcWidth = state.currentSheet.getColumnWidth(col) * 1.15;	// offset to handle width differences of apache poi
+						int maxColumnWidth = 255 * 256; // The maximum column width for an individual cell is 255 
 														// characters
 						if (calcWidth > maxColumnWidth) {
 							calcWidth = maxColumnWidth;
 						}
 						if (calcWidth > oldWidth) {
-							state.currentSheet.setColumnWidth(col, (int) (calcWidth));
+							state.currentSheet.setColumnWidth(col, (int) calcWidth);
 						}
+					} else {
+						state.currentSheet.autoSizeColumn(col, true);
 					}
 				}
 			}