From 3b88a604982f89a1424638ce8634c751516af021 Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Tue, 3 Nov 2015 07:07:11 +0000
Subject: [PATCH] supporting change for bug 57450 from Stefan Thurnherr

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1712217 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/poi/ss/util/SheetUtil.java     | 59 ++++++++++++++-----
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java
index bd7ab67ee..2c2633a3e 100644
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -207,33 +207,62 @@ public class SheetUtil {
      * @return  the width in pixels or -1 if cell is empty
      */
     public static double getColumnWidth(Sheet sheet, int column, boolean useMergedCells, int firstRow, int lastRow){
-        Workbook wb = sheet.getWorkbook();
         DataFormatter formatter = new DataFormatter();
-        Font defaultFont = wb.getFontAt((short) 0);
-
-        AttributedString str = new AttributedString(String.valueOf(defaultChar));
-        copyAttributes(defaultFont, str, 0, 1);
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        int defaultCharWidth = (int)layout.getAdvance();
+        int defaultCharWidth = getDefaultCharWidth(sheet.getWorkbook());
 
         double width = -1;
         for (int rowIdx = firstRow; rowIdx <= lastRow; ++rowIdx) {
             Row row = sheet.getRow(rowIdx);
             if( row != null ) {
-
-                Cell cell = row.getCell(column);
-
-                if (cell == null) {
-                    continue;
-                }
-
-                double cellWidth = getCellWidth(cell, defaultCharWidth, formatter, useMergedCells);
+                double cellWidth = getColumnWidthForRow(row, column, defaultCharWidth, formatter, useMergedCells);
                 width = Math.max(width, cellWidth);
             }
         }
         return width;
     }
 
+    /**
+     * Get default character width
+     *
+     * @param wb the workbook to get the default character width from
+     * @return default character width
+     */
+    private static int getDefaultCharWidth(final Workbook wb) {
+        Font defaultFont = wb.getFontAt((short) 0);
+
+        AttributedString str = new AttributedString(String.valueOf(defaultChar));
+        copyAttributes(defaultFont, str, 0, 1);
+        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
+        int defaultCharWidth = (int) layout.getAdvance();
+        return defaultCharWidth;
+    }
+
+    /**
+     * Compute width of a single cell in a row
+     * Convenience method for {@link getCellWidth}
+     *
+     * @param row the row that contains the cell of interest
+     * @param column the column number of the cell whose width is to be calculated
+     * @param defaultCharWidth the width of a single character
+     * @param formatter formatter used to prepare the text to be measured
+     * @param useMergedCells    whether to use merged cells
+     * @return  the width in pixels or -1 if cell is empty
+     */
+    private static double getColumnWidthForRow(
+            Row row, int column, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells) {
+        if( row == null ) {
+            return -1;
+        }
+
+        Cell cell = row.getCell(column);
+
+        if (cell == null) {
+            return -1;
+        }
+
+        return getCellWidth(cell, defaultCharWidth, formatter, useMergedCells);
+    }
+
     /**
      * Check if the Fonts are installed correctly so that Java can compute the size of
      * columns.