Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(SheetUtil): Migrate defaultCharWidth to double (avoids auto resizing errors)

This commit is contained in:
nmelzner 2023-11-02 13:32:10 +01:00
parent 5533d35cef
commit 441a61ec61
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
View File

@ -47,7 +47,7 @@ import org.apache.poi.util.Internal;
*/ */
@Internal @Internal
/*package*/ class AutoSizeColumnTracker { /*package*/ class AutoSizeColumnTracker {
private final int defaultCharWidth; private final double defaultCharWidth;
private final DataFormatter dataFormatter = new DataFormatter(); private final DataFormatter dataFormatter = new DataFormatter();
// map of tracked columns, with values containing the best-fit width for the column // map of tracked columns, with values containing the best-fit width for the column

14
poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
View File

@ -118,7 +118,7 @@ public class SheetUtil {
* @param useMergedCells whether to use merged cells * @param useMergedCells whether to use merged cells
* @return the width in pixels or -1 if cell is empty * @return the width in pixels or -1 if cell is empty
*/ */
public static double getCellWidth(Cell cell, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells) { public static double getCellWidth(Cell cell, double defaultCharWidth, DataFormatter formatter, boolean useMergedCells) {
List<CellRangeAddress> mergedRegions = cell.getSheet().getMergedRegions(); List<CellRangeAddress> mergedRegions = cell.getSheet().getMergedRegions();
return getCellWidth(cell, defaultCharWidth, formatter, useMergedCells, mergedRegions); return getCellWidth(cell, defaultCharWidth, formatter, useMergedCells, mergedRegions);
} }
@ -137,7 +137,7 @@ public class SheetUtil {
* @param mergedRegions The list of merged regions as received via cell.getSheet().getMergedRegions() * @param mergedRegions The list of merged regions as received via cell.getSheet().getMergedRegions()
* @return the width in pixels or -1 if cell is empty * @return the width in pixels or -1 if cell is empty
*/ */
public static double getCellWidth(Cell cell, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells, public static double getCellWidth(Cell cell, double defaultCharWidth, DataFormatter formatter, boolean useMergedCells,
List<CellRangeAddress> mergedRegions) { List<CellRangeAddress> mergedRegions) {
Sheet sheet = cell.getSheet(); Sheet sheet = cell.getSheet();
Workbook wb = sheet.getWorkbook(); Workbook wb = sheet.getWorkbook();
@ -219,7 +219,7 @@ public class SheetUtil {
* @param str the text contained in the cell * @param str the text contained in the cell
* @return the best fit cell width * @return the best fit cell width
*/ */
private static double getCellWidth(int defaultCharWidth, int colspan, private static double getCellWidth(double defaultCharWidth, int colspan,
CellStyle style, double minWidth, AttributedString str) { CellStyle style, double minWidth, AttributedString str) {
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext); TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
final Rectangle2D bounds; final Rectangle2D bounds;
@ -270,7 +270,7 @@ public class SheetUtil {
*/ */
public static double getColumnWidth(Sheet sheet, int column, boolean useMergedCells, int firstRow, int lastRow){ public static double getColumnWidth(Sheet sheet, int column, boolean useMergedCells, int firstRow, int lastRow){
DataFormatter formatter = new DataFormatter(); DataFormatter formatter = new DataFormatter();
int defaultCharWidth = getDefaultCharWidth(sheet.getWorkbook()); double defaultCharWidth = getDefaultCharWidth(sheet.getWorkbook());
List<CellRangeAddress> mergedRegions = sheet.getMergedRegions(); List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
double width = -1; double width = -1;
@ -292,14 +292,14 @@ public class SheetUtil {
* @return default character width in pixels * @return default character width in pixels
*/ */
@Internal @Internal
public static int getDefaultCharWidth(final Workbook wb) { public static double getDefaultCharWidth(final Workbook wb) {
Font defaultFont = wb.getFontAt( 0); Font defaultFont = wb.getFontAt( 0);
AttributedString str = new AttributedString(String.valueOf(defaultChar)); AttributedString str = new AttributedString(String.valueOf(defaultChar));
copyAttributes(defaultFont, str, 0, 1); copyAttributes(defaultFont, str, 0, 1);
try { try {
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext); TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
return Math.round(layout.getAdvance()); return layout.getAdvance();
} catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError e) { } catch (UnsatisfiedLinkError | NoClassDefFoundError | InternalError e) {
if (ignoreMissingFontSystem) { if (ignoreMissingFontSystem) {
return DEFAULT_CHAR_WIDTH; return DEFAULT_CHAR_WIDTH;
@ -321,7 +321,7 @@ public class SheetUtil {
* @return the width in pixels or -1 if cell is empty * @return the width in pixels or -1 if cell is empty
*/ */
private static double getColumnWidthForRow( private static double getColumnWidthForRow(
Row row, int column, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells, Row row, int column, double defaultCharWidth, DataFormatter formatter, boolean useMergedCells,
List<CellRangeAddress> mergedRegions) { List<CellRangeAddress> mergedRegions) {
if( row == null ) { if( row == null ) {
return -1; return -1;