Small tweak to NamePtg and Ref3DPtg

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@696501 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hssf/model/FormulaParser.java b/src/java/org/apache/poi/hssf/model/FormulaParser.java
index fd46a5792b236c1f4d428388b56bc882d4d1b004..6d0c23374f1ca9bc9740eff30cda80eb6df8d6c5 100644 (file)
--- a/src/java/org/apache/poi/hssf/model/FormulaParser.java
+++ b/src/java/org/apache/poi/hssf/model/FormulaParser.java
@@ -318,7 +318,7 @@ public final class FormulaParser {
         for(int i = 0; i < book.getNumberOfNames(); i++) {
             // named range name matching is case insensitive
             if(book.getNameAt(i).getNameName().equalsIgnoreCase(name)) {
-                return new NamePtg(name, book);
+                return new NamePtg(i);
             }
         }
         throw new FormulaParseException("Specified named range '"
@@ -389,7 +389,7 @@ public final class FormulaParser {
 
                 // calls to user-defined functions within the workbook
                 // get a Name token which points to a defined name record
-                nameToken = new NamePtg(name, this.book);
+                nameToken = new NamePtg(nameIndex);
             } else {
 
                 nameToken = book.getNameXPtg(name);

diff --git a/src/java/org/apache/poi/hssf/record/NameRecord.java b/src/java/org/apache/poi/hssf/record/NameRecord.java
index c1337230e9fc3f65c0689e77b934dfaeb9cd6ec5..d36124e7b29c3471dabb92380b0c09c9c662651c 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/NameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NameRecord.java
@@ -447,7 +447,7 @@ public final class NameRecord extends Record {
        /** gets the extern sheet number
         * @return extern sheet index
         */
-       public short getExternSheetNumber(){
+       public int getExternSheetNumber(){
                if (field_13_name_definition.length < 1) {
                        return 0;
                }
@@ -513,7 +513,7 @@ public final class NameRecord extends Record {
                        oldPtg = field_13_name_definition[0];
                }
                List temp = new ArrayList();
-               short externSheetIndex = 0;
+               int externSheetIndex = 0;
 
                if (oldPtg.getClass() == Area3DPtg.class){
                        externSheetIndex =  ((Area3DPtg) oldPtg).getExternSheetIndex();

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 421c4c4f5d5305dfe2d495a45564c3e1363d956a..64af99a88234f48e62a83b73b87a7af52a32d037 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
@@ -31,33 +31,14 @@ public final class NamePtg extends OperandPtg {
     public final static short sid  = 0x23;
     private final static int  SIZE = 5;
     /** one-based index to defined name record */
-    private short             field_1_label_index;
+    private int  field_1_label_index;
     private short             field_2_zero;   // reserved must be 0
 
     /**
-     * Creates new NamePtg and sets its name index to that of the corresponding defined name record
-     * in the workbook.  The search for the name record is case insensitive.  If it is not found, 
-     * it gets created.
+     * @param nameIndex zero-based index to name within workbook
      */
-    public NamePtg(String name, HSSFWorkbook book) {
-        field_1_label_index = (short)(1+getOrCreateNameRecord(book, name)); // convert to 1-based
-    }
-    /**
-     * @return zero based index of the found or newly created defined name record. 
-     */
-    private static final int getOrCreateNameRecord(HSSFWorkbook book, String name) {
-        // perhaps this logic belongs in Workbook?
-        int countNames = book.getNumberOfNames();
-        for (int i = 0; i < countNames; i++) {
-            if(name.equalsIgnoreCase( book.getNameName(i) )) {
-                return i; 
-            }
-        }
-        
-        HSSFName nameObj = book.createName();
-        nameObj.setNameName(name);
-        
-        return countNames;
+    public NamePtg(int nameIndex) {
+        field_1_label_index = 1+nameIndex; // convert to 1-based
     }
 
     /** Creates new NamePtg */
@@ -75,9 +56,9 @@ public final class NamePtg extends OperandPtg {
     }
 
     public void writeBytes(byte [] array, int offset) {
-        array[offset+0]= (byte) (sid + getPtgClass());
-        LittleEndian.putShort(array,offset+1,field_1_label_index);
-        LittleEndian.putShort(array,offset+3, field_2_zero);
+       LittleEndian.putByte(array, offset + 0, sid + getPtgClass());
+               LittleEndian.putUShort(array, offset + 1, field_1_label_index);
+               LittleEndian.putUShort(array, offset + 3, field_2_zero);
     }
 
     public int getSize() {

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 e125d485c4fd0359bf8831cea94e45fefb0b3fd5..8ad9eae053922d7d42c95b47bcbcb4223442d89a 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
@@ -44,7 +44,7 @@ public final class Ref3DPtg extends RefPtgBase {
         readCoordinates(in);
     }
     
-    public Ref3DPtg(String cellref, short externIdx ) {
+    public Ref3DPtg(String cellref, int externIdx ) {
         CellReference c= new CellReference(cellref);
         setRow(c.getRow());
         setColumn(c.getCol());
@@ -65,17 +65,17 @@ public final class Ref3DPtg extends RefPtgBase {
     }
 
     public void writeBytes(byte [] array, int offset) {
-        array[ 0 + offset ] = (byte) (sid + getPtgClass());
-        LittleEndian.putShort(array, 1 + offset , getExternSheetIndex());
-        writeCoordinates(array, offset+3);
+       LittleEndian.putByte(array, 0 + offset, sid + getPtgClass());
+               LittleEndian.putUShort(array, 1 + offset, getExternSheetIndex());
+               writeCoordinates(array, offset + 3);
     }
 
     public int getSize() {
         return SIZE;
     }
 
-    public short getExternSheetIndex(){
-        return (short)field_1_index_extern_sheet;
+    public int getExternSheetIndex(){
+        return field_1_index_extern_sheet;
     }
 
     public void setExternSheetIndex(int index){

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
index b8d24dd8f72204db5d71fadabe7a09f767e6ac17..8c264e4a597f468b7a849c343062cdcce3292f38 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
@@ -47,7 +47,7 @@ public final class HSSFName {
      * @return sheet name, which this named range referred to
      */
     public String getSheetName() {
-        short indexToExternSheet = _definedNameRec.getExternSheetNumber();
+        int indexToExternSheet = _definedNameRec.getExternSheetNumber();
 
         return _book.getWorkbook().findSheetNameFromExternSheet(indexToExternSheet);
     }