From 434ce09afdb94ad59a93ab70f55fe18c96e88cf4 Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Wed, 2 Apr 2008 10:25:18 +0000
Subject: [PATCH] Fixed inconsistency between HSSFSHeet.getColumnWidth and
 HSSFSheet.getDefaultColumnWidth: getColumnWidth should always return width
 measured in 1/256th units.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@643834 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/hssf/model/Sheet.java |  12 ++--
 .../org/apache/poi/hssf/data/colwidth.xls     | Bin 0 -> 13824 bytes
 .../poi/hssf/usermodel/TestHSSFSheet.java     |  62 +++++++++++++++++-
 3 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100755 src/testcases/org/apache/poi/hssf/data/colwidth.xls

diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 451cde7579..2af25e7481 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -1879,12 +1879,12 @@ public class Sheet implements Model
     }
 
     /**
-     * get the width of a given column in units of 1/20th of a point width (twips?)
+     * get the width of a given column in units of 1/256th of a character width
      * @param column index
      * @see org.apache.poi.hssf.record.DefaultColWidthRecord
      * @see org.apache.poi.hssf.record.ColumnInfoRecord
      * @see #setColumnWidth(short,short)
-     * @return column width in units of 1/20th of a point (twips?)
+     * @return column width in units of 1/256th of a character width
      */
 
     public short getColumnWidth(short column)
@@ -1912,7 +1912,9 @@ public class Sheet implements Model
         }
         else
         {
-            retval = defaultcolwidth.getColWidth();
+            //default column width is measured in characters
+            //multiply
+            retval = (short)(256*defaultcolwidth.getColWidth());
         }
         return retval;
     }
@@ -1951,9 +1953,9 @@ public class Sheet implements Model
     }
 
     /**
-     * set the width for a given column in 1/20th of a character width units
+     * set the width for a given column in 1/256th of a character width units
      * @param column - the column number
-     * @param width (in units of 1/20th of a character width)
+     * @param width (in units of 1/256th of a character width)
      */
     public void setColumnWidth(short column, short width)
     {
diff --git a/src/testcases/org/apache/poi/hssf/data/colwidth.xls b/src/testcases/org/apache/poi/hssf/data/colwidth.xls
new file mode 100755
index 0000000000000000000000000000000000000000..7ffd3a42b4761409a3b0628eff436e76ab682bd9
GIT binary patch
literal 13824
zcmeHOU1(fI6#nl1Z+>?-O|`YgbrWf_i6KqF21A=wtQe$N+Da=%Vw!G$NaD&SN)^Rb
z+qVjBTJR+(1qDU0iWourki6B0q7({hUQ&fVDWWK}P`iHT+`YMXW41)GP~*&U&dfP8
zbI;6o=gyrobNB17;`66JUV90P!WQ^(y%<Hvqqmq|<H#{EzgQH}iEn3`Dii)g2t*^i
zk)a@dY&;+Sa)wDia0xzq6qqFkz9$XfS=0beWDn%>$wzZ9j^>_E-t6$8wqeMUHq3C~
zZMH(NsPkirypH2gauUiLl%LVEXO(Ye&SC!U>fP1S!*XEVJ-&>Vdqa6jc^$ch&$P~W
zs@Z_GILGqESB}eY2Tla72av}h3}F;EFSjYM4nf=oq*_wV9nH;MgKfP7t&T9z))cs#
z&*HkW{3my0_dQi!D1|WYbPIKMm0yRlTxvZcNG&e4=xU{+n~+8~Fept)C!Lm+#DP{-
z47Bx@6sdbtZ1-SmW{_4o(Z(OEdh4Z=-b(3YS&cq);Qn%Bb`Q$!Y12F=`}$m?_o1D4
z$u;WKU$E;`R?}|Hd92dg{d+N~vCU?ZqL+c7`rn+a8|!6cE>*sgUaq=S`IW4<kd*F~
zf`ezfjl-42`nC%Cjtcs81%31{`jfr@Vg-Lu;&>sXaiS2=xS<f%7zJp&st_zb&AGzD
zQO-bTg3`(mb{@=TCpL)Ya@eEk7R^r)k7naB1X$O?tQ8>vg&qsn_$WG|$QdYt;YcIN
z(E*L6<b^6G?CCmIHeFZyIE8z{0lu?qbz-X_--mil$H{>h4P1NwmkZnWZtojZeOmSH
z%3o7W!PBIB2n#1eyvm%}fIK47oY%GV5#^_4CSeKbn8gmdVZP5!OZ+&?M)0z{Mi|B{
zX;VODsnz0hWgm0qJhGot{-oc{53pW;z?FlXHW75?5O2w}M-FpF91FSm5w@cx?8;F@
zG3Sx1P=(2en_rD;^haH}M*2|Y%C*FL+9TKTwvSc2`SrxVrN)(Gya#h0IgU6cYu)?=
zUtRrmwhUjL4dDXc;!9v!*JPOm9XR9H6D1AyOAGj!FaVoK%N;gvam?MC!=?fZ+TV<F
zoBb;=yc=EdFnAy{NrQkvz#w1{_@5$hojW)|^?%C&kafiT(YJrS`q;tP2PYzEU;oLs
zUDUlpl4Y*sXGpT(dxRtl)?K6oX_O=jy(6Sr(s5D)X^JF^&>vW-iLum`AZb~`dN&xn
z`fZ1X^SSZd{)yz)!^7E8wTn|%*0g^9g_U8!LQm-Id#BD>r6rJ5HNhZY5HJWB1PlTO
z0fT@+z#w1{FbEg~3<3rL4+1yx|9uzFU!3Z^BX;sl`u`nQKNSD}8xnWO)&JklxSq6!
z#FJ|tHGzjEw*N2w`~*q-{+CFrNzQ)2F{WjI;8W64`vKy|Uv89x7dupnn`lJJ%6^1>
z3g;%f-Q-5pu%H-{jRv{c?p%IkT#oI=wZ7RmASNal1PlTO0fT@+z#w1{FbEg~3<3rL
zgTRVLK+f^SH5MOO&g12yR{3&Jd}{e$hxq#P1);dj;<L+nzI>D@e!t|$8Oxc!`1#J~
zq2lYyet_ivL6X>nTN8mD$niIUB(~xi#(BKJJGcC>nqQANJ(F>ij0gv2l;dGLD(5mD
z9L;W8&tn98wH+gldf74m0kU9U+Oh14vO&cV#7;biG5&_M@BKt!zqUy<6a3#tj+)A$
mmG<QslILf+_VwfL1^W-t!mzd>t9Rh<wWsGF^j}Sv?EeXHJwNvV

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index a4a31feabf..13eafa4fd8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -870,5 +870,65 @@ public class TestHSSFSheet
     
     public static void main(java.lang.String[] args) {
 		 junit.textui.TestRunner.run(TestHSSFSheet.class);
-	}    
+	}
+
+    public void testColumnWidth() throws Exception {
+        //check we can correctly read column widths from a reference workbook
+        String filename = System.getProperty("HSSF.testdata.path") + "/colwidth.xls";
+        HSSFWorkbook wb = new HSSFWorkbook(new FileInputStream(filename));
+
+        //reference values
+        int[] ref = {365, 548, 731, 914, 1097, 1280, 1462, 1645, 1828, 2011, 2194, 2377, 2560, 2742, 2925, 3108, 3291, 3474, 3657};
+
+        HSSFSheet sh = wb.getSheetAt(0);
+        for (char i = 'A'; i <= 'S'; i++) {
+            int idx = i - 'A';
+            int w = sh.getColumnWidth((short)idx);
+            assertEquals(ref[idx], w);
+        }
+
+        //the second sheet doesn't have overridden column widths
+        sh = wb.getSheetAt(1);
+        int def_width = sh.getDefaultColumnWidth();
+        for (char i = 'A'; i <= 'S'; i++) {
+            int idx = i - 'A';
+            int w = sh.getColumnWidth((short)idx);
+            //getDefaultColumnWidth returns width measued in characters
+            //getColumnWidth returns width measued in 1/256th units
+            assertEquals(def_width*256, w);
+        }
+
+        //test new workbook
+        wb = new HSSFWorkbook();
+        sh = wb.createSheet();
+        sh.setDefaultColumnWidth((short)10);
+        assertEquals(10, sh.getDefaultColumnWidth());
+        assertEquals(256*10, sh.getColumnWidth((short)0));
+        assertEquals(256*10, sh.getColumnWidth((short)1));
+        assertEquals(256*10, sh.getColumnWidth((short)2));
+        for (char i = 'D'; i <= 'F'; i++) {
+            short w = (short)(256*12);
+            sh.setColumnWidth((short)i, w);
+            assertEquals(w, sh.getColumnWidth((short)i));
+        }
+
+        //serialize and read again
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        wb.write(out);
+        out.close();
+
+        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
+        sh = wb.getSheetAt(0);
+        assertEquals(10, sh.getDefaultColumnWidth());
+        //columns A-C have default width
+        assertEquals(256*10, sh.getColumnWidth((short)0));
+        assertEquals(256*10, sh.getColumnWidth((short)1));
+        assertEquals(256*10, sh.getColumnWidth((short)2));
+        //columns D-F have custom wodth
+        for (char i = 'D'; i <= 'F'; i++) {
+            short w = (short)(256*12);
+            assertEquals(w, sh.getColumnWidth((short)i));
+        }
+
+    }
 }