cvs commit: jakarta-poi/src/java/org/apache/poi/hssf/usermodel HSSFCell.java

[acoliver]

acoliver    02/04/27 10:26:06

  Modified:    src/java/org/apache/poi/hssf/record/formula
                        FormulaParser.java
               src/java/org/apache/poi/hssf/usermodel HSSFCell.java
  Log:
  Fixes for formulas
  
  Revision  Changes    Path
  1.3       +4 -1      
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FormulaParser.java
  
  Index: FormulaParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FormulaParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FormulaParser.java        27 Apr 2002 14:07:53 -0000      1.2
  +++ FormulaParser.java        27 Apr 2002 17:26:06 -0000      1.3
  @@ -62,6 +62,8 @@
   
   import org.apache.poi.hssf.usermodel.*;
   import java.io.FileOutputStream;
  +import java.io.File;
  +
   
   /**
    * EXPERIMENTAL 
  @@ -438,7 +440,8 @@
           System.out.println("Converted Text form is : 
"+fp.toFormulaString(fp.getRPNPtg()));
           try {
           short            rownum = 0;
  -        FileOutputStream out    = new FileOutputStream("test.xls");
  +        File file = File.createTempFile("testFormula",".xls");
  +        FileOutputStream out    = new FileOutputStream(file);
           HSSFWorkbook     wb     = new HSSFWorkbook();
           HSSFSheet        s      = wb.createSheet();
           HSSFRow          r      = null;
  
  
  
  1.7       +1 -1      jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
  
  Index: HSSFCell.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HSSFCell.java     27 Apr 2002 14:07:53 -0000      1.6
  +++ HSSFCell.java     27 Apr 2002 17:26:06 -0000      1.7
  @@ -701,7 +701,7 @@
               fp.parse();
               Ptg[] ptg  = fp.getRPNPtg();
               int   size = 0;
  -            System.out.println("got Ptgs " + ptg.length);
  +            //System.out.println("got Ptgs " + ptg.length);
               for (int k = 0; k < ptg.length; k++) {
                   size += ptg[ k ].getSize();
                   rec.pushExpressionToken(ptg[ k ]);