poi-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel TestHSSFWorkbook.java TestBugs.java
Date Sun, 27 Jun 2004 11:08:02 GMT
glens       2004/06/27 04:08:02

  Modified:    src/java/org/apache/poi/hssf/record Tag: REL_2_BRANCH
                        NameRecord.java
               src/java/org/apache/poi/hssf/usermodel Tag: REL_2_BRANCH
                        HSSFWorkbook.java
               src/testcases/org/apache/poi/hssf/usermodel Tag:
                        REL_2_BRANCH TestBugs.java
  Added:       src/testcases/org/apache/poi/hssf/usermodel Tag:
                        REL_2_BRANCH TestHSSFWorkbook.java
  Log:
  Fix for bug 29747
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.12.2.4  +2 -1      jakarta-poi/src/java/org/apache/poi/hssf/record/NameRecord.java
  
  Index: NameRecord.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/NameRecord.java,v
  retrieving revision 1.12.2.3
  retrieving revision 1.12.2.4
  diff -u -r1.12.2.3 -r1.12.2.4
  --- NameRecord.java	22 Feb 2004 11:54:47 -0000	1.12.2.3
  +++ NameRecord.java	27 Jun 2004 11:08:01 -0000	1.12.2.4
  @@ -924,7 +924,8 @@
               .append("\n");
           buffer.append("    .Status bar text (Unicode string without length field)  = ").append(
field_17_status_bar_text )
               .append("\n");
  -        buffer.append(org.apache.poi.util.HexDump.dump(this.field_13_raw_name_definition,0,0));
  +        if (field_13_raw_name_definition != null)
  +            buffer.append(org.apache.poi.util.HexDump.dump(this.field_13_raw_name_definition,0,0));
           buffer.append("[/NAME]\n");
           
           return buffer.toString();
  
  
  
  No                   revision
  No                   revision
  1.24.2.7  +1 -1      jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
  
  Index: HSSFWorkbook.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java,v
  retrieving revision 1.24.2.6
  retrieving revision 1.24.2.7
  diff -u -r1.24.2.6 -r1.24.2.7
  --- HSSFWorkbook.java	22 Feb 2004 11:54:53 -0000	1.24.2.6
  +++ HSSFWorkbook.java	27 Jun 2004 11:08:02 -0000	1.24.2.7
  @@ -515,7 +515,7 @@
           }
           if ( nameRecord == null )
           {
  -            nameRecord = workbook.createBuiltInName(NameRecord.BUILTIN_PRINT_TITLE, externSheetIndex+1);
  +            nameRecord = workbook.createBuiltInName(NameRecord.BUILTIN_PRINT_TITLE, sheetIndex+1);
               //does a lot of the house keeping for builtin records, like setting lengths
to zero etc
               isNewRecord = true;
           }
  
  
  
  No                   revision
  No                   revision
  1.1.2.18  +2 -5      jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
  
  Index: TestBugs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- TestBugs.java	22 Feb 2004 11:25:59 -0000	1.1.2.17
  +++ TestBugs.java	27 Jun 2004 11:08:02 -0000	1.1.2.18
  @@ -18,11 +18,7 @@
   
   package org.apache.poi.hssf.usermodel;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileOutputStream;
  +import java.io.*;
   
   import junit.framework.TestCase;
   
  @@ -458,6 +454,7 @@
   		assertEquals("Re-Written Formula String Cell value", d1.getStringCellValue(), rd2.getStringCellValue());
   
   	}
  +
   }
   
   
  
  
  
  No                   revision
  
  Index: TestBugs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- TestBugs.java	22 Feb 2004 11:25:59 -0000	1.1.2.17
  +++ TestBugs.java	27 Jun 2004 11:08:02 -0000	1.1.2.18
  @@ -18,11 +18,7 @@
   
   package org.apache.poi.hssf.usermodel;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileOutputStream;
  +import java.io.*;
   
   import junit.framework.TestCase;
   
  @@ -458,6 +454,7 @@
   		assertEquals("Re-Written Formula String Cell value", d1.getStringCellValue(), rd2.getStringCellValue());
   
   	}
  +
   }
   
   
  
  
  
  No                   revision
  
  Index: TestBugs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- TestBugs.java	22 Feb 2004 11:25:59 -0000	1.1.2.17
  +++ TestBugs.java	27 Jun 2004 11:08:02 -0000	1.1.2.18
  @@ -18,11 +18,7 @@
   
   package org.apache.poi.hssf.usermodel;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileOutputStream;
  +import java.io.*;
   
   import junit.framework.TestCase;
   
  @@ -458,6 +454,7 @@
   		assertEquals("Re-Written Formula String Cell value", d1.getStringCellValue(), rd2.getStringCellValue());
   
   	}
  +
   }
   
   
  
  
  
  1.1.2.1   +21 -0     jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/Attic/TestHSSFWorkbook.java
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org


Mime
View raw message