cvs commit: jakarta-poi/src/java/org/apache/poi/hssf/model FormulaParser.java

[glens]

glens       2004/04/29 00:04:04

  Modified:    src/java/org/apache/poi/hssf/model Tag: REL_2_BRANCH
                        FormulaParser.java
  Log:
  Bugfix: http://issues.apache.org/bugzilla/show_bug.cgi?id=24925
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.13.2.4  +9 -8      
jakarta-poi/src/java/org/apache/poi/hssf/model/FormulaParser.java
  
  Index: FormulaParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/FormulaParser.java,v
  retrieving revision 1.13.2.3
  retrieving revision 1.13.2.4
  diff -u -r1.13.2.3 -r1.13.2.4
  --- FormulaParser.java        22 Feb 2004 11:54:46 -0000      1.13.2.3
  +++ FormulaParser.java        29 Apr 2004 07:04:04 -0000      1.13.2.4
  @@ -737,17 +737,18 @@
       }
       
       private void setParameterRVA(Node n, int formulaType) {
  -        Ptg p = (Ptg) n.getValue();
  +        Ptg p = n.getValue();
  +        int numOperands = n.getNumChildren();
           if (p instanceof AbstractFunctionPtg) {
  -            int numOperands = n.getNumChildren();
  -            for (int i =0;i<n.getNumChildren();i++) {
  +            for (int i =0;i<numOperands;i++) {
                   
setParameterRVA(n.getChild(i),((AbstractFunctionPtg)p).getParameterClass(i),formulaType);
  -                if (n.getChild(i).getValue() instanceof AbstractFunctionPtg) {
  -                    setParameterRVA(n.getChild(i),formulaType);
  -                }
  -            }  
  +//                if (n.getChild(i).getValue() instanceof AbstractFunctionPtg) {
  +//                    setParameterRVA(n.getChild(i),formulaType);
  +//                }
  +                setParameterRVA(n.getChild(i),formulaType);
  +            }
           } else {
  -            for (int i =0;i<n.getNumChildren();i++) {
  +            for (int i =0;i<numOperands;i++) {
                   setParameterRVA(n.getChild(i),formulaType);
               }
           } 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]