From e785cbdd46396e38d4d150e030a7399a997bab90 Mon Sep 17 00:00:00 2001
From: Avik Sengupta <avik@apache.org>
Date: Sun, 31 Aug 2003 06:16:57 +0000
Subject: [PATCH] Syncing to REL_2_BR: Macro functions and related fixes, by
 Paul Krause bug id:21444

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353326 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/poi/hssf/dev/FormulaViewer.java    |   7 +-
 .../apache/poi/hssf/model/FormulaParser.java  | 107 ++++++++++--------
 .../apache/poi/hssf/record/NameRecord.java    |  71 ++++++++++--
 .../record/formula/AbstractFunctionPtg.java   |  12 +-
 .../poi/hssf/record/formula/AddPtg.java       |   4 +-
 .../poi/hssf/record/formula/Area3DPtg.java    |   4 +-
 .../poi/hssf/record/formula/AreaPtg.java      |   4 +-
 .../poi/hssf/record/formula/AttrPtg.java      |  10 +-
 .../poi/hssf/record/formula/BoolPtg.java      |   4 +-
 .../poi/hssf/record/formula/ConcatPtg.java    |   4 +-
 .../poi/hssf/record/formula/DividePtg.java    |   6 +-
 .../poi/hssf/record/formula/EqualPtg.java     |   6 +-
 .../poi/hssf/record/formula/ExpPtg.java       |   4 +-
 .../hssf/record/formula/GreaterEqualPtg.java  |   6 +-
 .../hssf/record/formula/GreaterThanPtg.java   |   6 +-
 .../poi/hssf/record/formula/IntPtg.java       |   4 +-
 .../poi/hssf/record/formula/LessEqualPtg.java |   6 +-
 .../poi/hssf/record/formula/LessThanPtg.java  |   7 +-
 .../poi/hssf/record/formula/MemErrPtg.java    |   4 +-
 .../poi/hssf/record/formula/MemFuncPtg.java   |   4 +-
 .../hssf/record/formula/MissingArgPtg.java    |   6 +-
 .../poi/hssf/record/formula/MultiplyPtg.java  |  10 +-
 .../poi/hssf/record/formula/NamePtg.java      |  27 ++++-
 .../poi/hssf/record/formula/NameXPtg.java     |   4 +-
 .../poi/hssf/record/formula/NotEqualPtg.java  |   6 +-
 .../poi/hssf/record/formula/NumberPtg.java    |   5 +-
 .../hssf/record/formula/ParenthesisPtg.java   |   5 +-
 .../poi/hssf/record/formula/PowerPtg.java     |   6 +-
 .../apache/poi/hssf/record/formula/Ptg.java   |   4 +-
 .../poi/hssf/record/formula/Ref3DPtg.java     |   4 +-
 .../poi/hssf/record/formula/ReferencePtg.java |   4 +-
 .../poi/hssf/record/formula/StringPtg.java    |   5 +-
 .../poi/hssf/record/formula/SubtractPtg.java  |   4 +-
 .../hssf/record/formula/UnaryMinusPtg.java    |   4 +-
 .../poi/hssf/record/formula/UnaryPlusPtg.java |   4 +-
 .../poi/hssf/record/formula/UnionPtg.java     |   4 +-
 .../poi/hssf/record/formula/UnknownPtg.java   |   4 +-
 .../apache/poi/hssf/usermodel/HSSFCell.java   |   3 +-
 .../apache/poi/hssf/usermodel/HSSFName.java   |   4 +-
 .../poi/hssf/usermodel/HSSFWorkbook.java      |   2 +-
 .../org/apache/poi/hssf/data/SquareMacro.xls  | Bin 0 -> 25600 bytes
 .../poi/hssf/model/TestFormulaParser.java     |  16 ++-
 .../poi/hssf/usermodel/TestFormulas.java      |  58 +++++++++-
 43 files changed, 301 insertions(+), 168 deletions(-)
 create mode 100644 src/testcases/org/apache/poi/hssf/data/SquareMacro.xls

diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
index 1e7fd9596..3443fda1a 100644
--- a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
+++ b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
@@ -77,7 +77,6 @@ import org.apache.poi.hssf.record.*;
 import org.apache.poi.hssf.record.formula.*;
 import org.apache.poi.hssf.model.*;
 import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.SheetReferences;
 
 /**
  * FormulaViewer - finds formulas in a BIFF8 file and attempts to read them/display
@@ -144,7 +143,7 @@ public class FormulaViewer
             StringBuffer buf = new StringBuffer();
             
             if (token instanceof ExpPtg) return;
-            buf.append(name=((OperationPtg) token).toFormulaString((SheetReferences)null));
+            buf.append(name=((OperationPtg) token).toFormulaString((Workbook)null));
             buf.append(sep);
             switch (token.getPtgClass()) {
                 case Ptg.CLASS_REF :
@@ -213,7 +212,7 @@ public class FormulaViewer
         StringBuffer buf = new StringBuffer();
            for (int i=0;i<numptgs;i++) {
            token = (Ptg) tokens.get(i);
-            buf.append( token.toFormulaString((SheetReferences)null));
+            buf.append( token.toFormulaString((Workbook)null));
             switch (token.getPtgClass()) {
                 case Ptg.CLASS_REF :
                     buf.append("(R)");
@@ -233,7 +232,7 @@ public class FormulaViewer
     
     private String composeFormula(FormulaRecord record)
     {
-       return  org.apache.poi.hssf.model.FormulaParser.toFormulaString((SheetReferences)null,record.getParsedExpression());
+       return  org.apache.poi.hssf.model.FormulaParser.toFormulaString((Workbook)null,record.getParsedExpression());
     }
 
     /**
diff --git a/src/java/org/apache/poi/hssf/model/FormulaParser.java b/src/java/org/apache/poi/hssf/model/FormulaParser.java
index b41f08487..60515707d 100644
--- a/src/java/org/apache/poi/hssf/model/FormulaParser.java
+++ b/src/java/org/apache/poi/hssf/model/FormulaParser.java
@@ -64,7 +64,6 @@ import java.util.List;
 //import PTG's .. since we need everything, import *
 import org.apache.poi.hssf.record.formula.*;
 
-import org.apache.poi.hssf.util.SheetReferences;
 
 
 /**
@@ -335,10 +334,14 @@ public class FormulaParser {
         int numArgs = Arguments();
         Match(')');
                 
-        Ptg functionPtg = getFunction(name,(byte)numArgs);
+        AbstractFunctionPtg functionPtg = getFunction(name,(byte)numArgs);
         
 		tokens.add(functionPtg);
  
+        if (functionPtg.getName().equals("externalflag")) {
+            tokens.add(new NamePtg(name, this.book));
+        }
+
  		//remove what we just put in
 		this.functionTokens.remove(0);
     }
@@ -382,8 +385,8 @@ public class FormulaParser {
      * @param numArgs
      * @return Ptg a null is returned if we're in an IF formula, it needs extreme manipulation and is handled in this function
      */
-    private Ptg getFunction(String name,byte numArgs) {
-        Ptg retval = null;
+    private AbstractFunctionPtg getFunction(String name, byte numArgs) {
+        AbstractFunctionPtg retval = null;
         
         if (name.equals("IF")) {
             retval = new FuncVarPtg(AbstractFunctionPtg.ATTR_NAME, numArgs);
@@ -795,69 +798,85 @@ end;
     /**
      * Convience method which takes in a list then passes it to the other toFormulaString
      * signature. 
-     * @param lptgs - list of ptgs, can be null
+     * @param book   workbook for 3D and named references
+     * @param lptgs  list of Ptg, can be null or empty
+     * @return a human readable String
      */
-    public static String toFormulaString(SheetReferences refs, List lptgs) {
+    public static String toFormulaString(Workbook book, List lptgs) {
         String retval = null;
         if (lptgs == null || lptgs.size() == 0) return "#NAME";
         Ptg[] ptgs = new Ptg[lptgs.size()];
         ptgs = (Ptg[])lptgs.toArray(ptgs);
-        retval = toFormulaString(refs, ptgs);
+        retval = toFormulaString(book, ptgs);
         return retval;
     }
     
-    /** Static method to convert an array of Ptgs in RPN order 
-     *  to a human readable string format in infix mode
-     *  @param ptgs - array of ptgs, can be null or empty
+    /**
+     * Static method to convert an array of Ptgs in RPN order
+     * to a human readable string format in infix mode.
+     * @param book  workbook for named and 3D references
+     * @param ptgs  array of Ptg, can be null or empty
+     * @return a human readable String
      */
-    public static String toFormulaString(SheetReferences refs, Ptg[] ptgs) {
+    public static String toFormulaString(Workbook book, Ptg[] ptgs) {
         if (ptgs == null || ptgs.length == 0) return "#NAME";
         java.util.Stack stack = new java.util.Stack();
-        int numPtgs = ptgs.length;
-        OperationPtg o;
-        int numOperands;
-        String result=null;
-        String[] operands;
         AttrPtg ifptg = null;
-        for (int i=0;i<numPtgs;i++) {
+
            // Excel allows to have AttrPtg at position 0 (such as Blanks) which
            // do not have any operands. Skip them.
-            if (ptgs[i] instanceof OperationPtg && i>0) {
-                  o = (OperationPtg) ptgs[i];
+        stack.push(ptgs[0].toFormulaString(book));
                   
-                  if (o instanceof AttrPtg && ((AttrPtg)o).isOptimizedIf()) {
-                        ifptg=(AttrPtg)o;
-                  } else {
+        for (int i = 1; i < ptgs.length; i++) {
+            if (! (ptgs[i] instanceof OperationPtg)) {
+                stack.push(ptgs[i].toFormulaString(book));
+                continue;
+            }
                       
-                      numOperands = o.getNumberOfOperands();
-                      operands = new String[numOperands];
+            if (ptgs[i] instanceof AttrPtg && ((AttrPtg) ptgs[i]).isOptimizedIf()) {
+                ifptg = (AttrPtg) ptgs[i];
+                continue;
+            }
                       
-                      for (int j=0;j<numOperands;j++) {
-                          operands[numOperands-j-1] = (String) stack.pop(); //TODO: catch stack underflow and throw parse exception. 
+            final OperationPtg o = (OperationPtg) ptgs[i];
+            final String[] operands = new String[o.getNumberOfOperands()];
+
+            for (int j = operands.length; j > 0; j--) {
+                //TODO: catch stack underflow and throw parse exception.
+                operands[j - 1] = (String) stack.pop();
                       }  
 
-                      if ( (o instanceof AbstractFunctionPtg) && 
-                            ((AbstractFunctionPtg)o).getName().equals("specialflag") &&
-                            ifptg != null
-                            ) {
+            stack.push(o.toFormulaString(operands));
+            if (!(o instanceof AbstractFunctionPtg)) continue;
+
+            final AbstractFunctionPtg f = (AbstractFunctionPtg) o;
+            final String fname = f.getName();
+            if (fname == null) continue;
+
+            if ((ifptg != null) && (fname.equals("specialflag"))) {
                              // this special case will be way different.
-                             result = ifptg.toFormulaString(
-                                  new String[] {(o.toFormulaString(operands))}
-                                                           );
-                             ifptg = null;
-                      } else {                      
-                        result = o.toFormulaString(operands);                                              
+                stack.push(ifptg.toFormulaString(new String[]{(String) stack.pop()}));
+                continue;
                       }
-                      stack.push(result);                                        
+            if (fname.equals("externalflag")) {
+                final String top = (String) stack.pop();
+                final int paren = top.indexOf('(');
+                final int comma = top.indexOf(',');
+                if (comma == -1) {
+                    final int rparen = top.indexOf(')');
+                    stack.push(top.substring(paren + 1, rparen) + "()");
                   }
-                      
-                  
-            } else {
-                stack.push(ptgs[i].toFormulaString(refs));
+                else {
+                    stack.push(top.substring(paren + 1, comma) + '(' +
+                               top.substring(comma + 1));
             }
         }
-        return (String) stack.pop(); //TODO: catch stack underflow and throw parse exception. 
     }
+        // TODO: catch stack underflow and throw parse exception.
+        return (String) stack.pop();
+    }
+
+
     /** Create a tree representation of the RPN token array
      *used to run the class(RVA) change algo
      */
@@ -890,11 +909,9 @@ end;
      *   Useful for testing
      */
     public String toString() {
-        SheetReferences refs = null;
-        if (book!=null)  book.getSheetReferences();
         StringBuffer buf = new StringBuffer();
            for (int i=0;i<tokens.size();i++) {
-            buf.append( ( (Ptg)tokens.get(i)).toFormulaString(refs));
+            buf.append( ( (Ptg)tokens.get(i)).toFormulaString(book));
             buf.append(' ');
         } 
         return buf.toString();
diff --git a/src/java/org/apache/poi/hssf/record/NameRecord.java b/src/java/org/apache/poi/hssf/record/NameRecord.java
index 01fe777df..b91c829b8 100644
--- a/src/java/org/apache/poi/hssf/record/NameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NameRecord.java
@@ -58,11 +58,11 @@ package org.apache.poi.hssf.record;
 import java.util.List;
 import java.util.Stack;
 
+import org.apache.poi.hssf.model.Workbook;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 import org.apache.poi.hssf.record.formula.Ref3DPtg;
 import org.apache.poi.hssf.util.RangeAddress;
-import org.apache.poi.hssf.util.SheetReferences;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
@@ -127,6 +127,14 @@ public class NameRecord extends Record {
 	 */
 	public final static byte  BUILTIN_SHEET_TITLE           = (byte)12;
     
+    public static final short OPT_HIDDEN_NAME =   (short) 0x0001;
+    public static final short OPT_FUNCTION_NAME = (short) 0x0002;
+    public static final short OPT_COMMAND_NAME =  (short) 0x0004;
+    public static final short OPT_MACRO =         (short) 0x0008;
+    public static final short OPT_COMPLEX =       (short) 0x0010;
+    public static final short OPT_BUILTIN =       (short) 0x0020;
+    public static final short OPT_BINDATA =       (short) 0x1000;
+
     
     private short             field_1_option_flag;
     private byte              field_2_keyboard_shortcut;
@@ -192,7 +200,7 @@ public class NameRecord extends Record {
 	{
 	    this();	    
 	    this.field_12_builtIn_name = builtin;
-	    this.setOptionFlag((short)(this.getOptionFlag() | (short)0x20));
+	    this.setOptionFlag((short)(this.getOptionFlag() | OPT_BUILTIN));
 	    this.setNameTextLength((byte)1);
 	    this.setEqualsToIndexToSheet(index); //the extern sheets are set through references
 	    
@@ -252,13 +260,22 @@ public class NameRecord extends Record {
 
 	/**
 	 * Convenience method to retrieve the index the name refers to.
-	 * @see getEqualsToIndexToSheet()
+	 * @see #getEqualsToIndexToSheet()
 	 * @return short
 	 */
 	public short getIndexToSheet() {
 		return getEqualsToIndexToSheet();
 	}
 
+    /**
+     * @return function group
+     * @see FnGroupCountRecord
+     */
+    public byte getFnGroup() {
+        int masked = field_1_option_flag & 0x0fc0;
+        return (byte) (masked >> 4);
+    }
+
     public void setEqualsToIndexToSheet(short value)
     {
         field_6_equals_to_index_to_sheet = value;
@@ -409,11 +426,47 @@ public class NameRecord extends Record {
         return field_11_compressed_unicode_flag;
     }
 
+    /**
+     * @return true if name is hidden
+     */
+    public boolean isHiddenName() {
+        return (field_1_option_flag & OPT_HIDDEN_NAME) != 0;
+    }
+
+    /**
+     * @return true if name is a function
+     */
+    public boolean isFunctionName() {
+        return (field_1_option_flag & OPT_FUNCTION_NAME) != 0;
+    }
+
+    /**
+     * @return true if name is a command
+     */
+    public boolean isCommandName() {
+        return (field_1_option_flag & OPT_COMMAND_NAME) != 0;
+    }
+
+    /**
+     * @return true if function macro or command macro
+     */
+    public boolean isMacro() {
+        return (field_1_option_flag & OPT_MACRO) != 0;
+    }
+
+    /**
+     * @return true if array formula or user defined
+     */
+    public boolean isComplexFunction() {
+        return (field_1_option_flag & OPT_COMPLEX) != 0;
+    }
+
+
 	/**Convenience Function to determine if the name is a built-in name
 	 */
 	public boolean isBuiltInName()
 	{
-	    return ((this.getOptionFlag() & (short)0x20) != 0);
+	    return ((this.getOptionFlag() & OPT_BUILTIN) != 0);
 	}
 
 
@@ -511,7 +564,7 @@ public class NameRecord extends Record {
         data[18 + offset] = getCompressedUnicodeFlag();
 
         /* temp: gjs
-        if ( ( field_1_option_flag & (short) 0x20 ) != 0 )
+        if (isBuiltInName())
         {
             LittleEndian.putShort( data, 2 + offset, (short) ( 16 + field_13_raw_name_definition.length ) );
 
@@ -647,16 +700,16 @@ public class NameRecord extends Record {
     /** gets the reference , the area only (range)
      * @return area reference
      */
-    public String getAreaReference(SheetReferences refs){
+    public String getAreaReference(Workbook book){
         if (field_13_name_definition == null) return "#REF!";
         Ptg ptg = (Ptg) field_13_name_definition.peek();
         String result = "";
 
         if (ptg.getClass() == Area3DPtg.class){
-            result = ptg.toFormulaString(refs);
+            result = ptg.toFormulaString(book);
 
         } else if (ptg.getClass() == Ref3DPtg.class){
-            result = ptg.toFormulaString(refs);
+            result = ptg.toFormulaString(book);
         }
 
         return result;
@@ -727,7 +780,7 @@ public class NameRecord extends Record {
 
         /*
         temp: gjs
-        if ( ( field_1_option_flag & (short)0x20 ) != 0 ) {
+        if (isBuiltInName()) {
             // DEBUG
             // System.out.println( "Built-in name" );
 
diff --git a/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java b/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
index da08a6dc3..cd2660219 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
@@ -54,9 +54,8 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.BinaryTree;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
-import java.util.Stack;
 
 /**
  * This class provides the base functionality for Excel sheet functions 
@@ -69,7 +68,7 @@ public abstract class AbstractFunctionPtg extends OperationPtg {
 	//constant used allow a ptgAttr to be mapped properly for its functionPtg
 	public static final String ATTR_NAME = "specialflag";
 	    
-      
+    public static final short INDEX_EXTERNAL = 255;
     
     private static BinaryTree map = produceHash(); 
     protected static Object[][] functionData = produceFunctionData();
@@ -104,7 +103,7 @@ public abstract class AbstractFunctionPtg extends OperationPtg {
         return lookupName(field_2_fnc_index);
     }
     
-    public String toFormulaString(SheetReferences refs) {
+    public String toFormulaString(Workbook book) {
         return getName();
     }
     
@@ -140,7 +139,9 @@ public abstract class AbstractFunctionPtg extends OperationPtg {
     }
     
     protected short lookupIndex(String name) {
-        return (short)((Integer)map.getKeyForValue(name)).intValue();
+        Integer index = (Integer) map.getKeyForValue(name);
+        if (index != null) return index.shortValue();
+        return INDEX_EXTERNAL;
     }
     
     /**
@@ -389,6 +390,7 @@ public abstract class AbstractFunctionPtg extends OperationPtg {
         dmap.put(new Integer(252),"FREQUENCY");
         dmap.put(new Integer(253),"ADDTOOLBAR");
         dmap.put(new Integer(254),"DELETETOOLBAR");
+        dmap.put(new Integer(255),"externalflag");
         dmap.put(new Integer(256),"RESETTOOLBAR");
         dmap.put(new Integer(257),"EVALUATE");
         dmap.put(new Integer(258),"GETTOOLBAR");
diff --git a/src/java/org/apache/poi/hssf/record/formula/AddPtg.java b/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
index ead884067..3a519dceb 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
@@ -62,7 +62,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Addition operator PTG the "+" binomial operator.  If you need more 
@@ -113,7 +113,7 @@ public class AddPtg
     }
     
     /** Implementation of method from Ptg */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "+";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
index e8a6317bd..89401a981 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
@@ -291,8 +291,9 @@ public class Area3DPtg extends Ptg
 
 	}
 
-	public String toFormulaString( SheetReferences refs )
+	public String toFormulaString(Workbook book)
 	{
+		SheetReferences refs = book == null ? null : book.getSheetReferences();
 		StringBuffer retval = new StringBuffer();
 		if ( refs != null )
 		{
@@ -352,4 +353,3 @@ public class Area3DPtg extends Ptg
 
 
 }
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java b/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
index 4f994151d..3189a2c85 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
@@ -65,7 +65,7 @@ import org.apache.poi.util.BitField;
 
 import org.apache.poi.hssf.util.AreaReference;
 import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Specifies a rectangular area of cells A1:A4 for instance.
@@ -305,7 +305,7 @@ public class AreaPtg
         field_4_last_column = column;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
          return (new CellReference(getFirstRow(),getFirstColumn(),!isFirstRowRelative(),!isFirstColRelative())).toString() + ":" +
                 (new CellReference(getLastRow(),getLastColumn(),!isLastRowRelative(),!isLastColRelative())).toString();
diff --git a/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java b/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
index d389094d7..ebbfcba87 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
@@ -60,7 +60,7 @@
  */
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.BitField;
@@ -207,11 +207,11 @@ public class AttrPtg
         if(space.isSet(field_1_options)) {
             return operands[ 0 ];
         } else if (optiIf.isSet(field_1_options)) {
-            return toFormulaString((SheetReferences)null) + "(" + operands[ 0 ]             +")"; 
+            return toFormulaString((Workbook)null) + "(" + operands[ 0 ]             +")";
         } else if (optGoto.isSet(field_1_options)) {
-            return toFormulaString((SheetReferences)null) + operands[0];   //goto isn't a real formula element should not show up
+            return toFormulaString((Workbook)null) + operands[0];   //goto isn't a real formula element should not show up
         } else {
-            return toFormulaString((SheetReferences)null) + "(" + operands[ 0 ] + ")";
+            return toFormulaString((Workbook)null) + "(" + operands[ 0 ] + ")";
         }
     }
   
@@ -226,7 +226,7 @@ public class AttrPtg
         return -1;
     }
         
-   public String toFormulaString(SheetReferences refs) {
+   public String toFormulaString(Workbook book) {
       if(semiVolatile.isSet(field_1_options)) {
         return "ATTR(semiVolatile)";
       }
diff --git a/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java b/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
index 954eb0f80..84ad7cfca 100644
--- a/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
@@ -60,7 +60,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Boolean (boolean)
@@ -114,7 +114,7 @@ public class BoolPtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return field_1_value ? "TRUE" : "FALSE";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java b/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
index bed92e461..e7249bfbc 100644
--- a/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
@@ -62,7 +62,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -108,7 +108,7 @@ public class ConcatPtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return CONCAT;
     }    
diff --git a/src/java/org/apache/poi/hssf/record/formula/DividePtg.java b/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
index 124f25ede..6bb0d9420 100644
--- a/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
@@ -62,7 +62,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * This PTG implements the standard binomial divide "/"
@@ -108,7 +108,7 @@ public class DividePtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "/";
     }
@@ -117,7 +117,7 @@ public class DividePtg
         StringBuffer buffer = new StringBuffer();
 
         buffer.append(operands[ 0 ]);
-        buffer.append(toFormulaString((SheetReferences)null));
+        buffer.append(toFormulaString((Workbook)null));
         buffer.append(operands[ 1 ]);
         return buffer.toString();
     }      
diff --git a/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java b/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
index 1ddff9ac6..12438a339 100644
--- a/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
@@ -62,7 +62,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -107,7 +107,7 @@ public class EqualPtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "=";
     }
@@ -117,7 +117,7 @@ public class EqualPtg
 
         
         buffer.append(operands[ 0 ]);
-        buffer.append(toFormulaString((SheetReferences)null));
+        buffer.append(toFormulaString((Workbook)null));
         buffer.append(operands[ 1 ]);
         return buffer.toString();
     }       
diff --git a/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java b/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
index b100a1a76..d70e57968 100644
--- a/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
@@ -60,7 +60,7 @@
  */
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -102,7 +102,7 @@ public class ExpPtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "NO IDEA SHARED FORMULA EXP PTG";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java b/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
index 2763fe0b3..b06eaffbd 100755
--- a/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
@@ -54,7 +54,7 @@
 package org.apache.poi.hssf.record.formula;
 
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * PTG class to implement greater or equal to
@@ -98,7 +98,7 @@ public class GreaterEqualPtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return ">=";
     }
@@ -108,7 +108,7 @@ public class GreaterEqualPtg
 
         
         buffer.append(operands[ 0 ]);
-        buffer.append(toFormulaString((SheetReferences)null));
+        buffer.append(toFormulaString((Workbook)null));
         buffer.append(operands[ 1 ]);
         return buffer.toString();
     }       
diff --git a/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java b/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
index 5f7d6450e..04fbcac2e 100644
--- a/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
@@ -61,7 +61,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Greater than operator PTG ">"
@@ -133,7 +133,7 @@ public class GreaterThanPtg
      * Implementation of method from Ptg 
      * @param refs the Sheet References
      */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return this.GREATERTHAN;
     }
@@ -171,5 +171,3 @@ public class GreaterThanPtg
         return new GreaterThanPtg();
     }
 }
-
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
index 200f5dc65..e06f1ecd2 100644
--- a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
@@ -61,7 +61,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Integer (short intger)
@@ -116,7 +116,7 @@ public class IntPtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "" + getValue();
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java b/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
index 8c1f14bc7..98283745c 100755
--- a/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
@@ -53,7 +53,7 @@
  */
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 
 /**
@@ -99,7 +99,7 @@ public class LessEqualPtg
 		  return 2;
 	 }
 
-	 public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
 	 {
 		  return "<=";
 	 }
@@ -109,7 +109,7 @@ public class LessEqualPtg
 
         
 		  buffer.append(operands[ 0 ]);
-		  buffer.append(toFormulaString((SheetReferences)null));
+		  buffer.append(toFormulaString((Workbook)null));
 		  buffer.append(operands[ 1 ]);
 		  return buffer.toString();
 	 }       
diff --git a/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java b/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
index cab99be9c..a856b93bd 100644
--- a/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
@@ -63,7 +63,7 @@ package org.apache.poi.hssf.record.formula;
 import java.util.List;
 
 //POI
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Less than operator PTG "<". The SID is taken from the 
@@ -142,7 +142,7 @@ public class LessThanPtg
      * Implementation of method from Ptg 
      * @param refs the Sheet References
      */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return this.LESSTHAN;
     }
@@ -180,6 +180,3 @@ public class LessThanPtg
     }
 
 }
-
-
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java b/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
index c48ad8c3b..31a1bcafe 100644
--- a/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
@@ -61,7 +61,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -118,7 +118,7 @@ public class MemErrPtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "ERR#";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java b/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
index 2d422b1c7..a8b63609c 100644
--- a/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
@@ -60,7 +60,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * @author Glen Stampoultzis (glens at apache.org)
@@ -96,7 +96,7 @@ public class MemFuncPtg extends ControlPtg
         LittleEndian.putShort( array, offset + 1, (short)field_1_len_ref_subexpression );
     }
 
-    public String toFormulaString( SheetReferences refs )
+    public String toFormulaString(Workbook book)
     {
         return "";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java b/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
index 3f88ded3b..c65ab41f3 100644
--- a/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
@@ -54,7 +54,7 @@
 
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Missing Function Arguments
@@ -91,7 +91,7 @@ public class MissingArgPtg
     }
 
    
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return " ";
     }
@@ -103,5 +103,3 @@ public class MissingArgPtg
     }
 
 }
-
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
index 143702ce1..6b33e619b 100644
--- a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
@@ -61,7 +61,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Implements the standard mathmatical multiplication - *
@@ -114,7 +114,7 @@ public class MultiplyPtg
     }
     
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "*";
     }
@@ -123,9 +123,9 @@ public class MultiplyPtg
     {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(operands[ 0 ].toFormulaString((SheetReferences)null));
+        buffer.append(operands[ 0 ].toFormulaString((Workbook)null));
         buffer.append("*");
-        buffer.append(operands[ 1 ].toFormulaString((SheetReferences)null));
+        buffer.append(operands[ 1 ].toFormulaString((Workbook)null));
         return buffer.toString();
     }
     
@@ -133,7 +133,7 @@ public class MultiplyPtg
         StringBuffer buffer = new StringBuffer();
 
         buffer.append(operands[ 0 ]);
-        buffer.append(toFormulaString((SheetReferences)null));
+        buffer.append(toFormulaString((Workbook)null));
         buffer.append(operands[ 1 ]);
         return buffer.toString();
     }                  
diff --git a/src/java/org/apache/poi/hssf/record/formula/NamePtg.java b/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
index 3786cdd69..6cdee6af0 100644
--- a/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
@@ -61,7 +61,8 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.record.NameRecord;
 
 /**
  *
@@ -85,9 +86,22 @@ public class NamePtg
 
     /** Creates new NamePtg */
 
-    public NamePtg(String name)
+    public NamePtg(String name, Workbook book)
     {
-        //TODO
+        final short n = (short) (book.getNumNames() + 1);
+        NameRecord rec;
+        for (short i = 1; i < n; i++) {
+            rec = book.getNameRecord(i - 1);
+            if (name.equals(rec.getNameText())) {
+                field_1_label_index = i;
+                return;
+            }
+        }
+        rec = new NameRecord();
+        rec.setNameText(name);
+        rec.setNameTextLength((byte) name.length());
+        book.addName(rec);
+        field_1_label_index = n;
     }
 
     /** Creates new NamePtg */
@@ -113,12 +127,13 @@ public class NamePtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
-        return "NAMED RANGE";
+        NameRecord rec = book.getNameRecord(field_1_label_index - 1);
+        return rec.getNameText();
     }
     
-    public byte getDefaultOperandClass() {return Ptg.CLASS_VALUE;}
+    public byte getDefaultOperandClass() {return Ptg.CLASS_REF;}
 
     public Object clone() {
       NamePtg ptg = new NamePtg();
diff --git a/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java b/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
index 58fa09686..9b6225d80 100644
--- a/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
@@ -61,7 +61,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -113,7 +113,7 @@ public class NameXPtg extends Ptg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "NO IDEA - NAME";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java b/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
index 6965c98cd..7392adf81 100755
--- a/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
@@ -56,7 +56,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Ptg class to implement not equal
@@ -101,7 +101,7 @@ public class NotEqualPtg
 		  return 2;
 	 }
 
-	 public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
 	 {
 		  return "<>";
 	 }
@@ -111,7 +111,7 @@ public class NotEqualPtg
 
         
 		  buffer.append(operands[ 0 ]);
-		  buffer.append(toFormulaString((SheetReferences)null));
+		  buffer.append(toFormulaString((Workbook)null));
 		  buffer.append(operands[ 1 ]);
 		  return buffer.toString();
 	 }       
diff --git a/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java b/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
index e071420bc..b43c5536e 100644
--- a/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
@@ -55,7 +55,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 /**
  * Number
  * Stores a floating point value in a formula
@@ -113,7 +113,7 @@ public class NumberPtg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "" + getValue();
     }
@@ -125,4 +125,3 @@ public class NumberPtg
       return ptg;
     }
 }
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java b/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
index c2118f151..2abff9e73 100644
--- a/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
@@ -57,7 +57,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * While formula tokens are stored in RPN order and thus do not need parenthesis for 
@@ -107,7 +107,7 @@ public class ParenthesisPtg
         return 1;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "()";
     }
@@ -124,4 +124,3 @@ public class ParenthesisPtg
     }
 
 }
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java b/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
index ca7fa6486..161918abe 100644
--- a/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
@@ -62,7 +62,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -108,7 +108,7 @@ public class PowerPtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "^";
     }
@@ -118,7 +118,7 @@ public class PowerPtg
 
         
         buffer.append(operands[ 0 ]);
-        buffer.append(toFormulaString((SheetReferences)null));
+        buffer.append(toFormulaString((Workbook)null));
         buffer.append(operands[ 1 ]);
         return buffer.toString();
     }       
diff --git a/src/java/org/apache/poi/hssf/record/formula/Ptg.java b/src/java/org/apache/poi/hssf/record/formula/Ptg.java
index 70b060613..cdf584ed1 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Ptg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ptg.java
@@ -63,7 +63,7 @@ package org.apache.poi.hssf.record.formula;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -347,7 +347,7 @@ public abstract class Ptg
     /**
      * return a string representation of this token alone
      */
-    public abstract String toFormulaString(SheetReferences refs);
+    public abstract String toFormulaString(Workbook book);
     /**
      * dump a debug representation (hexdump) to a string
      */
diff --git a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
index 13ae2ef23..4e175e85b 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
@@ -61,6 +61,7 @@ import org.apache.poi.util.LittleEndian;
 import org.apache.poi.hssf.util.RangeAddress;
 import org.apache.poi.hssf.util.CellReference;
 import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 import org.apache.poi.util.BitField;
 import org.apache.poi.hssf.model.Workbook;
 
@@ -193,8 +194,9 @@ public class Ref3DPtg extends Ptg {
 
     }
 
-    public String toFormulaString(SheetReferences refs) {
+    public String toFormulaString(Workbook book) {
         StringBuffer retval = new StringBuffer();
+        SheetReferences refs = book == null ? null : book.getSheetReferences();
         if (refs != null) {
             retval.append(refs.getSheetName((int)this.field_1_index_extern_sheet));
             retval.append('!');
diff --git a/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java b/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
index 2ec380a4a..4c14aaf55 100644
--- a/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
@@ -64,7 +64,7 @@ import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.BitField;
 
 import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * ReferencePtg - handles references (such as A1, A2, IA4)
@@ -179,7 +179,7 @@ public class ReferencePtg extends Ptg
         return SIZE;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         //TODO -- should we store a cellreference instance in this ptg?? but .. memory is an issue, i believe!
         return (new CellReference(getRow(),getColumn(),!isRowRelative(),!isColRelative())).toString();
diff --git a/src/java/org/apache/poi/hssf/record/formula/StringPtg.java b/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
index 5bccc034f..bda122ed3 100644
--- a/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
@@ -56,7 +56,7 @@ package org.apache.poi.hssf.record.formula;
 
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.BitField;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -145,7 +145,7 @@ public class StringPtg
         }
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "\""+getValue()+"\"";
     }
@@ -162,4 +162,3 @@ public class StringPtg
    }
 
 }
-
diff --git a/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java b/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
index 2c5588f3d..cd9fa5fd7 100644
--- a/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
@@ -61,7 +61,7 @@
 package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -105,7 +105,7 @@ public class SubtractPtg
         return 2;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "-";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java b/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
index 6cbe9b64d..bb60dd09b 100644
--- a/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
@@ -56,7 +56,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Unary Plus operator
@@ -105,7 +105,7 @@ public class UnaryMinusPtg extends OperationPtg
     }
     
     /** Implementation of method from Ptg */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "+";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java b/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
index cf2a5e8b9..c7ec1e0e9 100644
--- a/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
@@ -56,7 +56,7 @@ package org.apache.poi.hssf.record.formula;
 
 import java.util.List;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * Unary Plus operator
@@ -105,7 +105,7 @@ public class UnaryPlusPtg extends OperationPtg
     }
     
     /** Implementation of method from Ptg */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "+";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java b/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
index f84235055..dea5997e0 100644
--- a/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
@@ -54,7 +54,7 @@
 
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  * @author Glen Stampoultzis (glens at apache.org)
@@ -95,7 +95,7 @@ public class UnionPtg extends OperationPtg
     }
 
     /** Implementation of method from Ptg */
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return ",";
     }
diff --git a/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java b/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
index 2dd064973..56d03f60c 100644
--- a/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
@@ -60,7 +60,7 @@
  */
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.hssf.util.SheetReferences;
+import org.apache.poi.hssf.model.Workbook;
 
 /**
  *
@@ -94,7 +94,7 @@ public class UnknownPtg
         return size;
     }
 
-    public String toFormulaString(SheetReferences refs)
+    public String toFormulaString(Workbook book)
     {
         return "UNKNOWN";
     }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
index c989753a6..394c60c7d 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
@@ -748,8 +748,7 @@ public class HSSFCell
 
     public String getCellFormula() {
         //Workbook.currentBook=book;
-        SheetReferences refs = book.getSheetReferences();
-        String retval = FormulaParser.toFormulaString(refs,
+        String retval = FormulaParser.toFormulaString(book,
                 ((FormulaRecordAggregate)sheet.getValueRecord(row,cellNum)).getFormulaRecord().getParsedExpression());
         //Workbook.currentBook=null;
         return retval;
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
index 0f7178225..8c1863402 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
@@ -123,8 +123,7 @@ public class HSSFName {
 
     public String getReference() {
         String result;
-        SheetReferences refs = book.getSheetReferences();
-        result = name.getAreaReference(refs);
+        result = name.getAreaReference(book);
 
         return result;
     }
@@ -167,4 +166,3 @@ public class HSSFName {
     }
 
 }
-
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index 70e08ced2..f26df3d9e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -891,7 +891,7 @@ public class HSSFWorkbook
 		if (name == null) return null;
 		//adding one here because 0 indicates a global named region; doesnt make sense for print areas
    
-		return name.getAreaReference(workbook.getSheetReferences());
+		return name.getAreaReference(workbook);
 	}    
     
     /**
diff --git a/src/testcases/org/apache/poi/hssf/data/SquareMacro.xls b/src/testcases/org/apache/poi/hssf/data/SquareMacro.xls
new file mode 100644
index 0000000000000000000000000000000000000000..54beeeb37ebd32597f52db4463f06b6a3c1cb093
GIT binary patch
literal 25600
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
b#*H=jK~_sguaF{F)QC4~?>!I1e**LWB^|Z+

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
index c4722a9a7..dadab580c 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
@@ -56,7 +56,6 @@ package org.apache.poi.hssf.model;
 import junit.framework.TestCase;
 
 import org.apache.poi.hssf.record.formula.*;
-import org.apache.poi.hssf.util.SheetReferences;
 
 /**
  * Test the low level formula parser functionality. High level tests are to 
@@ -145,7 +144,7 @@ public class TestFormulaParser extends TestCase {
         assertEquals(true, flag.getValue());
         assertEquals("Y", y.getValue());
         assertEquals("N", n.getValue());
-        assertEquals("IF", funif.toFormulaString(new SheetReferences()));
+        assertEquals("IF", funif.toFormulaString((Workbook) null));
         assertTrue("Goto ptg exists", goto1.isGoto());
     }
 
@@ -285,6 +284,19 @@ public class TestFormulaParser extends TestCase {
 		
 	}
 	    
+    public void testMacroFunction() {
+        Workbook w = new Workbook();
+        FormulaParser fp = new FormulaParser("FOO()", w);
+        fp.parse();
+        Ptg[] ptg = fp.getRPNPtg();
+
+        AbstractFunctionPtg tfunc = (AbstractFunctionPtg) ptg[0];
+        assertEquals("externalflag", tfunc.getName());
+
+        NamePtg tname = (NamePtg) ptg[1];
+        assertEquals("FOO", tname.toFormulaString(w));
+    }
+
      public static void main(String [] args) {
         System.out.println("Testing org.apache.poi.hssf.record.formula.FormulaParser");
         junit.textui.TestRunner.run(TestFormulaParser.class);
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
index 450c7325d..0baf1a3b6 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
@@ -744,7 +744,7 @@ extends TestCase {
     }
     
     public void testSheetFunctions()
-        throws java.io.IOException
+        throws IOException
     {
         String filename = System.getProperty("HSSF.testdata.path");
 
@@ -818,7 +818,7 @@ extends TestCase {
     }
     
     public void testStringFormulas()
-        throws java.io.IOException
+        throws IOException
     {
         String readFilename = System.getProperty("HSSF.testdata.path");
 
@@ -852,7 +852,7 @@ extends TestCase {
     
     
     public void testLogicalFormulas()
-        throws java.io.IOException
+        throws IOException
     {
 
             File file = File.createTempFile("testLogicalFormula",".xls");
@@ -880,7 +880,7 @@ extends TestCase {
     }
     
     public void testDateFormulas()
-        throws java.io.IOException
+        throws IOException
     {
         String readFilename = System.getProperty("HSSF.testdata.path");
 
@@ -918,7 +918,7 @@ extends TestCase {
 
     
     public void testIfFormulas()
-        throws java.io.IOException
+        throws IOException
     {
         String readFilename = System.getProperty("HSSF.testdata.path");
 
@@ -1008,7 +1008,7 @@ extends TestCase {
     }
 
 	public void testSumIf()
-		throws java.io.IOException
+		throws IOException
 	{
 		String readFilename = System.getProperty("HSSF.testdata.path");		
 		String function ="SUMIF(A1:A5,\">4000\",B1:B5)";
@@ -1060,6 +1060,52 @@ extends TestCase {
 		assertTrue("sumif == 0 bytes", file.length() > 0);
 	}
     
+    public void testSquareMacro() throws IOException {
+        File dir = new File(System.getProperty("HSSF.testdata.path"));
+        File xls = new File(dir, "SquareMacro.xls");
+        FileInputStream in = new FileInputStream(xls);
+        HSSFWorkbook w;
+        try {
+            w = new HSSFWorkbook(in);
+        } finally {
+            in.close();
+        }
+        HSSFSheet s0 = w.getSheetAt(0);
+        HSSFRow[] r = {s0.getRow(0), s0.getRow(1)};
+
+        HSSFCell a1 = r[0].getCell((short) 0);
+        assertEquals("square(1)", a1.getCellFormula());
+        assertEquals(1d, a1.getNumericCellValue(), 1e-9);
+
+        HSSFCell a2 = r[1].getCell((short) 0);
+        assertEquals("square(2)", a2.getCellFormula());
+        assertEquals(4d, a2.getNumericCellValue(), 1e-9);
+
+        HSSFCell b1 = r[0].getCell((short) 1);
+        assertEquals("IF(TRUE,square(1))", b1.getCellFormula());
+        assertEquals(1d, b1.getNumericCellValue(), 1e-9);
+
+        HSSFCell b2 = r[1].getCell((short) 1);
+        assertEquals("IF(TRUE,square(2))", b2.getCellFormula());
+        assertEquals(4d, b2.getNumericCellValue(), 1e-9);
+
+        HSSFCell c1 = r[0].getCell((short) 2);
+        assertEquals("square(square(1))", c1.getCellFormula());
+        assertEquals(1d, c1.getNumericCellValue(), 1e-9);
+
+        HSSFCell c2 = r[1].getCell((short) 2);
+        assertEquals("square(square(2))", c2.getCellFormula());
+        assertEquals(16d, c2.getNumericCellValue(), 1e-9);
+
+        HSSFCell d1 = r[0].getCell((short) 3);
+        assertEquals("square(one())", d1.getCellFormula());
+        assertEquals(1d, d1.getNumericCellValue(), 1e-9);
+
+        HSSFCell d2 = r[1].getCell((short) 3);
+        assertEquals("square(two())", d2.getCellFormula());
+        assertEquals(4d, d2.getNumericCellValue(), 1e-9);
+    }
+
     public static void main(String [] args) {
         System.out
         .println("Testing org.apache.poi.hssf.usermodel.TestFormulas");