Merged revisions 613395-613401 via svnmerge from

https://svn.apache.org/repos/asf/poi/trunk

........
  r613395 | yegor | 2008-01-19 15:27:02 +0100 (Sat, 19 Jan 2008) | 1 line
  
  use JDK 1.4 compatible constructor for IllegalStateException
........
  r613396 | yegor | 2008-01-19 15:28:10 +0100 (Sat, 19 Jan 2008) | 1 line
  
  add a check to prevent NPE in HSSFSheet.autoSizeColumn(). See Bug 44246
........
  r613400 | yegor | 2008-01-19 15:44:07 +0100 (Sat, 19 Jan 2008) | 1 line
  
  added unit tests for closed Bug 37684: Unhandled Continue Record Error
........
  r613401 | yegor | 2008-01-19 15:54:06 +0100 (Sat, 19 Jan 2008) | 1 line
  
  added a unit test for fixed bug 41139: Constructing HSSFWorkbook is failed,threw threw ArrayIndexOutOfBoundsException for creating UnknownRecord
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@613822 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/poi/hssf/record/DVRecord.java

@@ -187,10 +187,13 @@ public class DVRecord extends Record
        this.field_not_used_2 = in.readShort();
 
        //read sec formula data condition
-       // Not sure if this was needed or not...
+       //Not sure if this was needed or not...
        try {
            in.skip(this.field_size_sec_formula);
-       } catch(IOException e) { throw new IllegalStateException(e); } 
+       } catch(IOException e) {
+           e.printStackTrace();
+           throw new IllegalStateException(e.getMessage());
+       }
 
        token_pos = 0;
        while (token_pos < this.field_size_sec_formula)

src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java

@@ -1748,7 +1748,7 @@ public class HSSFSheet
                 } else if (cell.getCellType() == HSSFCell.CELL_TYPE_BOOLEAN) {
                     sval = String.valueOf(cell.getBooleanCellValue());
                 }
-
+                if(sval != null) {
                     String txt = sval + defaultChar;
                     str = new AttributedString(txt);
                     copyAttributes(font, str, 0, txt.length());
@@ -1771,6 +1771,7 @@ public class HSSFSheet
                         width = Math.max(width, layout.getBounds().getWidth() / defaultCharWidth);
                     }
                 }
+            }
 
             if (width != -1) {
                 if (width > Short.MAX_VALUE) { //width can be bigger that Short.MAX_VALUE!

src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java

@@ -954,6 +954,63 @@ extends TestCase {
         assertTrue("No Exceptions while reading file", true);
 
     }
+
+    /**
+     * Bug 37684  : Unhandled Continue Record Error
+     */
+    public void test37684 () throws Exception {
+        FileInputStream in = new FileInputStream(new File(cwd, "37684-1.xls"));
+        HSSFWorkbook wb = new HSSFWorkbook(in);
+        in.close();
+
+        assertTrue("No exceptions while reading workbook", true);
+
+        //serialize and read again
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        wb.write(out);
+        out.close();
+        assertTrue("No exceptions while saving workbook", true);
+
+        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
+        assertTrue("No exceptions while reading saved stream", true);
+
+
+        in = new FileInputStream(new File(cwd, "37684-2.xls"));
+        wb = new HSSFWorkbook(in);
+        in.close();
+
+        assertTrue("No exceptions while reading workbook", true);
+
+        //serialize and read again
+        out = new ByteArrayOutputStream();
+        wb.write(out);
+        out.close();
+        assertTrue("No exceptions while saving workbook", true);
+
+        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
+        assertTrue("No exceptions while reading saved stream", true);
+    }
+
+    /**
+     * Bug 41139: Constructing HSSFWorkbook is failed,threw threw ArrayIndexOutOfBoundsException for creating UnknownRecord
+     */
+    public void test41139() throws Exception {
+        FileInputStream in = new FileInputStream(new File(cwd, "41139.xls"));
+        HSSFWorkbook wb = new HSSFWorkbook(in);
+        in.close();
+
+        assertTrue("No Exceptions while reading file", true);
+
+        //serialize and read again
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        wb.write(out);
+        out.close();
+
+        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
+        assertTrue("No Exceptions while reading file", true);
+
+    }
+
 }
 
 

src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java

@@ -44,72 +44,6 @@ public class TestUnfixedBugs extends TestCase {
 	protected String cwd = System.getProperty("HSSF.testdata.path");
 	
 	 
-	 /* ArrayIndexOutOfBound in BOFRecord */  
-	 public void test28772() throws java.io.IOException {
-       String filename = System.getProperty("HSSF.testdata.path");
-       filename=filename+"/28772.xls";
-       FileInputStream in = new FileInputStream(filename);
-       HSSFWorkbook wb = new HSSFWorkbook(in);
-       assertTrue("Read book fine!" , true);
-   }
-	 
-	 /**
-	     * Bug 37684: Unhandled Continue Record Error
-	     * 
-	     * BUT NOW(Jan07): It triggers bug 41026!!
-	     * 
-	     * java.lang.ArrayIndexOutOfBoundsException: 30
-         at org.apache.poi.hssf.record.aggregates.ValueRecordsAggregate.rowHasCells(ValueRecordsAggregate.java:219)
-	     */
-	    public void test37684() throws Exception {
-	        FileInputStream in = new FileInputStream(new File(cwd, "37684.xls"));
-	        HSSFWorkbook wb = new HSSFWorkbook(in);
-	        in.close();
-
-	        HSSFSheet sheet = wb.getSheetAt( 0 );
-	        assertNotNull(sheet);
-
-	        assertTrue("No Exceptions while reading file", true);
-
-	        //serialize and read again
-	        ByteArrayOutputStream out = new ByteArrayOutputStream();
-	        wb.write(out);
-	        out.close();
-
-	        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
-	        assertTrue("No Exceptions while reading file", true);
-
-	    }
-	    
-	    /**
-	     * Bug 41139: Constructing HSSFWorkbook is failed,threw threw ArrayIndexOutOfBoundsException for creating UnknownRecord
-	     * 
-	     * BUT NOW (Jan07): It throws the following in write!!
-	     * java.lang.RuntimeException: Coding Error: This method should never be called. This ptg should be converted
-         at org.apache.poi.hssf.record.formula.AreaNPtg.writeBytes(AreaNPtg.java:54)
-         at org.apache.poi.hssf.record.formula.Ptg.serializePtgStack(Ptg.java:384)
-         at org.apache.poi.hssf.record.NameRecord.serialize(NameRecord.java:544)
-         at org.apache.poi.hssf.model.Workbook.serialize(Workbook.java:757)
-         at org.apache.poi.hssf.usermodel.HSSFWorkbook.getBytes(HSSFWorkbook.java:952)
-         at org.apache.poi.hssf.usermodel.HSSFWorkbook.write(HSSFWorkbook.java:898)
-
-	     */
-	    public void test41139() throws Exception {
-	        FileInputStream in = new FileInputStream(new File(cwd, "41139.xls"));
-	        HSSFWorkbook wb = new HSSFWorkbook(in);
-	        in.close();
-
-	        assertTrue("No Exceptions while reading file", true);
-
-	        //serialize and read again
-	        ByteArrayOutputStream out = new ByteArrayOutputStream();
-	        wb.write(out);
-	        out.close();
-
-	        wb = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
-	        assertTrue("No Exceptions while reading file", true);
-
-	    }
 
     public void test43493() throws Exception {
         // Has crazy corrup subrecords on