avik        2005/04/28 07:31:00

  Modified:    src/java/org/apache/poi/hssf/record NameRecord.java
               src/testcases/org/apache/poi/hssf/usermodel TestBugs.java
  Added:       src/testcases/org/apache/poi/hssf/data 27852.xls
  Log:
  bug 27852 - patch by Brice Copy
  
  Revision  Changes    Path
  1.17      +2 -2      
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- NameRecord.java   23 Aug 2004 08:52:33 -0000      1.16
  +++ NameRecord.java   28 Apr 2005 14:31:00 -0000      1.17
  @@ -617,7 +617,7 @@
        * @return extern sheet index
        */
       public short getExternSheetNumber(){
  -        if (field_13_name_definition == null) return 0;
  +        if (field_13_name_definition == null || 
field_13_name_definition.isEmpty()) return 0;
           Ptg ptg = (Ptg) field_13_name_definition.peek();
           short result = 0;
   
  @@ -664,7 +664,7 @@
        * @return area reference
        */
       public String getAreaReference(Workbook book){
  -        if (field_13_name_definition == null) return "#REF!";
  +        if (field_13_name_definition == null || 
field_13_name_definition.isEmpty()) return "#REF!";
           Ptg ptg = (Ptg) field_13_name_definition.peek();
           String result = "";
   
  
  
  
  1.1                  
jakarta-poi/src/testcases/org/apache/poi/hssf/data/27852.xls
  
        <<Binary file>>
  
  
  1.20      +16 -0     
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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TestBugs.java     28 Apr 2005 13:33:02 -0000      1.19
  +++ TestBugs.java     28 Apr 2005 14:31:00 -0000      1.20
  @@ -491,6 +491,22 @@
           assertTrue("No Exceptions while reading file", true);
           
       }
  +     
  +     /**names and macros */
  +     public void test27852() throws java.io.IOException {
  +        String filename = System.getProperty("HSSF.testdata.path");
  +        filename=filename+"/27852.xls";
  +        FileInputStream in = new FileInputStream(filename);
  +        HSSFWorkbook wb = new HSSFWorkbook(in);
  +        assertTrue("No Exceptions while reading file", true);
  +        for(int i = 0 ; i < wb.getNumberOfNames() ; i++)
  +        {
  +          HSSFName name = wb.getNameAt(i);
  +          name.getNameName();
  +          name.getReference();
  +        }
  +        assertTrue("No Exceptions till here!", true);
  +    }
   
   }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List:    http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/

Reply via email to