? jakarta-poi/build/classes
? jakarta-poi/build/contrib-classes
? jakarta-poi/build/contrib-test-classes
? jakarta-poi/build/contrib-test-results
? jakarta-poi/build/dist
? jakarta-poi/build/main-testokfile.txt
? jakarta-poi/build/scratchpad-classes
? jakarta-poi/build/scratchpad-test-classes
? jakarta-poi/build/scratchpad-test-results
? jakarta-poi/build/test-classes
? jakarta-poi/build/test-results
? jakarta-poi/build/tmp
Index: jakarta-poi/src/java/org/apache/poi/hssf/model/FormulaParser.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/model/FormulaParser.java,v
retrieving revision 1.13
diff -r1.13 FormulaParser.java
115a116,117
>     private SheetReferences refs;
>     
128d129
<     
129a131,142
>     /** Get the sheet references used for this parser */
>     public SheetReferences getSheetReferences () {
>         return refs;
>     }
>     
>     /** Assign the sheet references for this formula parser.
>      * @param refs SheetReferences passed in.
>      */
>     public void setSheetReferences (SheetReferences refs) {
>         this.refs = refs;
>     }
>     
295c308,316
<             short externIdx = book.checkExternSheet(book.getSheetIndex(sheetName));
---
>             short externIdx = -1;
>             // If the workbook passed in to the formula parser is valid, check the
>             // sheet name aginst it, otherwise, get it from refs if it's valid.
>             if (book != null) {
>                 externIdx = book.checkExternSheet(book.getSheetIndex(sheetName));
>             }
>             else if (refs != null) {
>                 externIdx = refs.getSheetIndex(sheetName);
>             }
893,894c914,918
<         SheetReferences refs = null;
<         if (book!=null)  book.getSheetReferences();
---
> 	// If the formula parser was created by passing in SheetReferences, they 
> 	// are given preference, even if book isn't null.
>         if (refs == null && book!=null)  {
>             refs = book.getSheetReferences();
> 	}
Index: jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java,v
retrieving revision 1.26
diff -r1.26 HSSFWorkbook.java
70a71
> import org.apache.poi.hssf.util.SheetReferences;
96a98
>  * @author  Eric Ladner (eladner at goldinc dot com)
458a461,471
>     }
> 
>     /**
>      * returns sheet references for the current workbook
>      *
>      */
>     public SheetReferences getSheetReferences() {
>         if (workbook != null) {
>            return workbook.getSheetReferences();
>         }
>         return null;
Index: jakarta-poi/src/java/org/apache/poi/hssf/util/SheetReferences.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/util/SheetReferences.java,v
retrieving revision 1.2
diff -r1.2 SheetReferences.java
58a59,62
> import java.util.Set;
> import java.util.Iterator;
> import java.lang.Integer;
> import java.lang.String;
64a69
>  * @author Eric Ladner (eladner at goldinc dot com)
74a80,84
>     /** 
>      * Add a name/number pair to the map 
>      * @param sheetName String name for the sheet
>      * @param number    Number for the corresponding sheet name
>      */
78a89,92
>     /** 
>      * Get the sheet name for the specific number
>      * @param number Sheet number to get the name of.
>      */
82a97,113
>     /** 
>      * Get the sheet number for the specific name
>      * @param sheetName Sheet name to get the index of.
>      */
>     public short getSheetIndex(String sheetName) {
>         Integer currentKey;
>         String  currentVal;
>         Iterator val = map.keySet().iterator();
>         while (val.hasNext()) {
>             currentKey = (Integer)val.next();
>             currentVal = (String)map.get(currentKey);
>             if (currentVal.equalsIgnoreCase(sheetName)) {
>                 return  currentKey.shortValue();
>             }
>         }
>         return (short)-1;
>     }
Index: jakarta-poi/src/testcases/org/apache/poi/hssf/util/TestSheetReferences.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/testcases/org/apache/poi/hssf/util/TestSheetReferences.java,v
retrieving revision 1.2
diff -r1.2 TestSheetReferences.java
84a85
>         assertTrue("ref A == 0", refs.getSheetIndex("A") == 0);