Attachment #21633 for bug #44539

View | Details | Raw Unified | Return to bug 44539
Collapse All | Expand All

Lines 304-310 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (-1 / +1 lines)
304	* @return HSSFCell representing that column or null if undefined.	304	* @return HSSFCell representing that column or null if undefined.
305	*/	305	*/
306		306
307	public HSSFCell getCell(short cellnum)	307	public HSSFCell getCell(int cellnum)
308	{	308	{
309	if(cellnum<0\|\|cellnum>=cells.length) return null;	309	if(cellnum<0\|\|cellnum>=cells.length) return null;
310	return cells[cellnum];	310	return cells[cellnum];

Lines 71-76 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/util/CellReference.java (+8 lines)
71	this(null, pRow, pCol, pAbsRow, pAbsCol);	71	this(null, pRow, pCol, pAbsRow, pAbsCol);
72	}	72	}
73	public CellReference(String pSheetName, int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {	73	public CellReference(String pSheetName, int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
		74	// TODO - "-1" is a special value being temporarily used for whole row and whole column area references.
		75	// so these checks are currently N.Q.R.
		76	if(pRow < -1) {
		77	throw new IllegalArgumentException("row index may not be negative");
		78	}
		79	if(pCol < -1) {
		80	throw new IllegalArgumentException("column index may not be negative");
		81	}
74	_sheetName = pSheetName;	82	_sheetName = pSheetName;
75	_rowIndex=pRow;	83	_rowIndex=pRow;
76	_colIndex=pCol;	84	_colIndex=pCol;





/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */
 

package org.apache.poi.hssf.record;

import java.util.Stack;

 * record types.
 * @author Danny Mui at apache dot org
 */
public final class SharedFormulaRecord extends Record {
public class SharedFormulaRecord
    extends Record
{
	 public final static short   sid = 0x4BC;
    
    private int               field_1_first_row;


    public SharedFormulaRecord(RecordInputStream in)
    {
          super(in);
    }
    
    protected void validateSid(short id)
    {
        if (id != this.sid)
        {
            throw new RecordFormatException("Not a valid SharedFormula");
        }        
    }    
    
    public int getFirstRow() {


    public int serialize(int offset, byte [] data)
    {
        //Because this record is converted to individual Formula records, this method is not required.
        throw new UnsupportedOperationException("Cannot serialize a SharedFormulaRecord");
    }

    public int getRecordSize()
    {
        //Because this record is converted to individual Formula records, this method is not required.
        throw new UnsupportedOperationException("Cannot get the size for a SharedFormulaRecord");

    }


      }
    }
    
    private int fixupRelativeColumn(int currentcolumn, int column, boolean relative) {
        if(relative) {
            // mask out upper bits to produce 'wrapping' at column 256 ("IV")
            return (column + currentcolumn) & 0x00FF;
        }
        return column;
    }

    private int fixupRelativeRow(int currentrow, int row, boolean relative) {
        if(relative) {
            // mask out upper bits to produce 'wrapping' at row 65536
            return (row+currentrow) & 0x00FFFF;
        }
        return row;
    }

    /**
     * Mirroring formula records so it is registered in the ValueRecordsAggregate
     */
    public boolean isInValueSection()
    {
         return true;
    }


     /**
      * Register it in the ValueRecordsAggregate so it can go into the FormulaRecordAggregate
      */
     public boolean isValue() {
         return true;
     }

    public Object clone() {
        //Because this record is converted to individual Formula records, this method is not required.
        throw new UnsupportedOperationException("Cannot clone a SharedFormulaRecord");
    }
}

Lines 36-42 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java (-2 / +2 lines)
36	* @author Jason Height (jheight at chariot dot net dot au)	36	* @author Jason Height (jheight at chariot dot net dot au)
37	*/	37	*/
38		38
39	public class AreaVPtg	39	public final class AreaVPtg
40	extends AreaPtg	40	extends AreaPtg
41	{	41	{
42	public final static short sid = 0x45;	42	public final static short sid = 0x45;
Lines 45-51 Link Here
45	//Required for clone methods	45	//Required for clone methods
46	}	46	}
47		47
48	public AreaVPtg(short firstRow, short lastRow, short firstColumn, short lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {	48	public AreaVPtg(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
49	super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);	49	super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
50	}	50	}
51		51

Lines 38-47 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java (-42 / +63 lines)
38	{	38	{
39	public final static short sid = 0x25;	39	public final static short sid = 0x25;
40	private final static int SIZE = 9;	40	private final static int SIZE = 9;
41	private short field_1_first_row;	41	/** zero based, unsigned 16 bit */
42	private short field_2_last_row;	42	private int field_1_first_row;
43	private short field_3_first_column;	43	/** zero based, unsigned 16 bit */
44	private short field_4_last_column;	44	private int field_2_last_row;
		45	/** zero based, unsigned 8 bit */
		46	private int field_3_first_column;
		47	/** zero based, unsigned 8 bit */
		48	private int field_4_last_column;
45		49
46	private final static BitField rowRelative = BitFieldFactory.getInstance(0x8000);	50	private final static BitField rowRelative = BitFieldFactory.getInstance(0x8000);
47	private final static BitField colRelative = BitFieldFactory.getInstance(0x4000);	51	private final static BitField colRelative = BitFieldFactory.getInstance(0x4000);
Lines 55-63 Link Here
55	AreaReference ar = new AreaReference(arearef);	59	AreaReference ar = new AreaReference(arearef);
56	CellReference firstCell = ar.getFirstCell();	60	CellReference firstCell = ar.getFirstCell();
57	CellReference lastCell = ar.getLastCell();	61	CellReference lastCell = ar.getLastCell();
58	setFirstRow((short)firstCell.getRow());	62	setFirstRow(firstCell.getRow());
59	setFirstColumn(firstCell.getCol());	63	setFirstColumn(firstCell.getCol());
60	setLastRow((short)lastCell.getRow());	64	setLastRow(lastCell.getRow());
61	setLastColumn(lastCell.getCol());	65	setLastColumn(lastCell.getCol());
62	setFirstColRelative(!firstCell.isColAbsolute());	66	setFirstColRelative(!firstCell.isColAbsolute());
63	setLastColRelative(!lastCell.isColAbsolute());	67	setLastColRelative(!lastCell.isColAbsolute());
Lines 65-71 Link Here
65	setLastRowRelative(!lastCell.isRowAbsolute());	69	setLastRowRelative(!lastCell.isRowAbsolute());
66	}	70	}
67		71
68	public AreaPtg(short firstRow, short lastRow, short firstColumn, short lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {	72	public AreaPtg(int firstRow, int lastRow, int firstColumn, int lastColumn,
		73	boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
		74
		75	checkColumnBounds(firstColumn);
		76	checkColumnBounds(lastColumn);
		77	checkRowBounds(firstRow);
		78	checkRowBounds(lastRow);
69	setFirstRow(firstRow);	79	setFirstRow(firstRow);
70	setLastRow(lastRow);	80	setLastRow(lastRow);
71	setFirstColumn(firstColumn);	81	setFirstColumn(firstColumn);
Lines 76-87 Link Here
76	setLastColRelative(lastColRelative);	86	setLastColRelative(lastColRelative);
77	}	87	}
78		88
		89	private static void checkColumnBounds(int colIx) {
		90	if((colIx & 0x0FF) != colIx) {
		91	throw new IllegalArgumentException("colIx (" + colIx + ") is out of range");
		92	}
		93	}
		94	private static void checkRowBounds(int rowIx) {
		95	if((rowIx & 0x0FFFF) != rowIx) {
		96	throw new IllegalArgumentException("rowIx (" + rowIx + ") is out of range");
		97	}
		98	}
		99
79	public AreaPtg(RecordInputStream in)	100	public AreaPtg(RecordInputStream in)
80	{	101	{
81	field_1_first_row = in.readShort();	102	field_1_first_row = in.readUShort();
82	field_2_last_row = in.readShort();	103	field_2_last_row = in.readUShort();
83	field_3_first_column = in.readShort();	104	field_3_first_column = in.readUShort();
84	field_4_last_column = in.readShort();	105	field_4_last_column = in.readUShort();
85	//System.out.println(toString());	106	//System.out.println(toString());
86	}	107	}
87		108
Lines 110-119 Link Here
110		131
111	public void writeBytes(byte [] array, int offset) {	132	public void writeBytes(byte [] array, int offset) {
112	array[offset] = (byte) (sid + ptgClass);	133	array[offset] = (byte) (sid + ptgClass);
113	LittleEndian.putShort(array,offset+1,field_1_first_row);	134	LittleEndian.putShort(array,offset+1,(short)field_1_first_row);
114	LittleEndian.putShort(array,offset+3,field_2_last_row);	135	LittleEndian.putShort(array,offset+3,(short)field_2_last_row);
115	LittleEndian.putShort(array,offset+5,field_3_first_column);	136	LittleEndian.putShort(array,offset+5,(short)field_3_first_column);
116	LittleEndian.putShort(array,offset+7,field_4_last_column);	137	LittleEndian.putShort(array,offset+7,(short)field_4_last_column);
117	}	138	}
118		139
119	public int getSize()	140	public int getSize()
Lines 124-165 Link Here
124	/**	145	/**
125	* @return the first row in the area	146	* @return the first row in the area
126	*/	147	*/
127	public short getFirstRow()	148	public int getFirstRow()
128	{	149	{
129	return field_1_first_row;	150	return field_1_first_row;
130	}	151	}
131		152
132	/**	153	/**
133	* sets the first row	154	* sets the first row
134	* @param row number (0-based)	155	* @param rowIx number (0-based)
135	*/	156	*/
136	public void setFirstRow(short row)	157	public void setFirstRow(int rowIx) {
137	{	158	checkRowBounds(rowIx);
138	field_1_first_row = row;	159	field_1_first_row = rowIx;
139	}	160	}
140		161
141	/**	162	/**
142	* @return last row in the range (x2 in x1,y1-x2,y2)	163	* @return last row in the range (x2 in x1,y1-x2,y2)
143	*/	164	*/
144	public short getLastRow()	165	public int getLastRow()
145	{	166	{
146	return field_2_last_row;	167	return field_2_last_row;
147	}	168	}
148		169
149	/**	170	/**
150	* @param row last row number in the area	171	* @param rowIx last row number in the area
151	*/	172	*/
152	public void setLastRow(short row)	173	public void setLastRow(int rowIx) {
153	{	174	checkRowBounds(rowIx);
154	field_2_last_row = row;	175	field_2_last_row = rowIx;
155	}	176	}
156		177
157	/**	178	/**
158	* @return the first column number in the area.	179	* @return the first column number in the area.
159	*/	180	*/
160	public short getFirstColumn()	181	public int getFirstColumn()
161	{	182	{
162	return columnMask.getShortValue(field_3_first_column);	183	return columnMask.getValue(field_3_first_column);
163	}	184	}
164		185
165	/**	186	/**
Lines 167-173 Link Here
167	*/	188	*/
168	public short getFirstColumnRaw()	189	public short getFirstColumnRaw()
169	{	190	{
170	return field_3_first_column;	191	return (short) field_3_first_column; // TODO
171	}	192	}
172		193
173	/**	194	/**
Lines 183-189 Link Here
183	* @param rel is relative or not.	204	* @param rel is relative or not.
184	*/	205	*/
185	public void setFirstRowRelative(boolean rel) {	206	public void setFirstRowRelative(boolean rel) {
186	field_3_first_column=rowRelative.setShortBoolean(field_3_first_column,rel);	207	field_3_first_column=rowRelative.setBoolean(field_3_first_column,rel);
187	}	208	}
188		209
189	/**	210	/**
Lines 198-218 Link Here
198	* set whether the first column is relative	219	* set whether the first column is relative
199	*/	220	*/
200	public void setFirstColRelative(boolean rel) {	221	public void setFirstColRelative(boolean rel) {
201	field_3_first_column=colRelative.setShortBoolean(field_3_first_column,rel);	222	field_3_first_column=colRelative.setBoolean(field_3_first_column,rel);
202	}	223	}
203		224
204	/**	225	/**
205	* set the first column in the area	226	* set the first column in the area
206	*/	227	*/
207	public void setFirstColumn(short column)	228	public void setFirstColumn(int colIx) {
208	{	229	checkColumnBounds(colIx);
209	field_3_first_column=columnMask.setShortValue(field_3_first_column, column);	230	field_3_first_column=columnMask.setValue(field_3_first_column, colIx);
210	}	231	}
211		232
212	/**	233	/**
213	* set the first column irespective of the bitmasks	234	* set the first column irespective of the bitmasks
214	*/	235	*/
215	public void setFirstColumnRaw(short column)	236	public void setFirstColumnRaw(int column)
216	{	237	{
217	field_3_first_column = column;	238	field_3_first_column = column;
218	}	239	}
Lines 220-228 Link Here
220	/**	241	/**
221	* @return lastcolumn in the area	242	* @return lastcolumn in the area
222	*/	243	*/
223	public short getLastColumn()	244	public int getLastColumn()
224	{	245	{
225	return columnMask.getShortValue(field_4_last_column);	246	return columnMask.getValue(field_4_last_column);
226	}	247	}
227		248
228	/**	249	/**
Lines 230-236 Link Here
230	*/	251	*/
231	public short getLastColumnRaw()	252	public short getLastColumnRaw()
232	{	253	{
233	return field_4_last_column;	254	return (short) field_4_last_column;
234	}	255	}
235		256
236	/**	257	/**
Lines 247-253 Link Here
247	* <code>false</code>	268	* <code>false</code>
248	*/	269	*/
249	public void setLastRowRelative(boolean rel) {	270	public void setLastRowRelative(boolean rel) {
250	field_4_last_column=rowRelative.setShortBoolean(field_4_last_column,rel);	271	field_4_last_column=rowRelative.setBoolean(field_4_last_column,rel);
251	}	272	}
252		273
253	/**	274	/**
Lines 262-277 Link Here
262	* set whether the last column should be relative or not	283	* set whether the last column should be relative or not
263	*/	284	*/
264	public void setLastColRelative(boolean rel) {	285	public void setLastColRelative(boolean rel) {
265	field_4_last_column=colRelative.setShortBoolean(field_4_last_column,rel);	286	field_4_last_column=colRelative.setBoolean(field_4_last_column,rel);
266	}	287	}
267		288
268		289
269	/**	290	/**
270	* set the last column in the area	291	* set the last column in the area
271	*/	292	*/
272	public void setLastColumn(short column)	293	public void setLastColumn(int colIx) {
273	{	294	checkColumnBounds(colIx);
274	field_4_last_column=columnMask.setShortValue(field_4_last_column, column);	295	field_4_last_column=columnMask.setValue(field_4_last_column, colIx);
275	}	296	}
276		297
277	/**	298	/**




	public final static byte sid = 0x3b;
	private final static int SIZE = 11; // 10 + 1 for Ptg
	private short field_1_index_extern_sheet;
	private int field_2_first_row;
	private int field_3_last_row;
	private int field_4_first_column;
	private int field_5_last_column;

	private BitField rowRelative = BitFieldFactory.getInstance( 0x8000 );
	private BitField colRelative = BitFieldFactory.getInstance( 0x4000 );

	public Area3DPtg(RecordInputStream in)
	{
		field_1_index_extern_sheet = in.readShort();
		field_2_first_row = in.readUShort();
		field_3_last_row = in.readUShort();
		field_4_first_column = in.readUShort();
		field_5_last_column = in.readUShort();
	}

	public Area3DPtg(short firstRow, short lastRow, short firstColumn, short lastColumn,
			boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative,
			short externalSheetIndex) {
		  setFirstRow(firstRow);
		  setLastRow(lastRow);
		  setFirstColumn(firstColumn);
		  setLastColumn(lastColumn);
		  setFirstRowRelative(firstRowRelative);
		  setLastRowRelative(lastRowRelative);
		  setFirstColRelative(firstColRelative);
		  setLastColRelative(lastColRelative);
		  setExternSheetIndex(externalSheetIndex);
	}

	public String toString()
	{
		StringBuffer buffer = new StringBuffer();


		buffer.append( "lastColRowRel = "
				+ isLastRowRelative() ).append( "\n" );
		buffer.append( "firstColRel   = " + isFirstColRelative() ).append( "\n" );
		buffer.append( "lastColRel	= " + isLastColRelative() ).append( "\n" );
		return buffer.toString();
	}


	{
		array[0 + offset] = (byte) ( sid + ptgClass );
		LittleEndian.putShort( array, 1 + offset, getExternSheetIndex() );
		LittleEndian.putShort( array, 3 + offset, (short)getFirstRow() );
		LittleEndian.putShort( array, 5 + offset, (short)getLastRow() );
		LittleEndian.putShort( array, 7 + offset, (short)getFirstColumnRaw() );
		LittleEndian.putShort( array, 9 + offset, (short)getLastColumnRaw() );
	}

	public int getSize()

		field_1_index_extern_sheet = index;
	}

	public int getFirstRow()
	{
		return field_2_first_row;
	}

	public void setFirstRow( int row )
	{
		field_2_first_row = row;
	}

	public int getLastRow()
	{
		return field_3_last_row;
	}

	public void setLastRow( int row )
	{
		field_3_last_row = row;
	}

	public int getFirstColumn()
	{
		return field_4_first_column & 0xFF;
	}

	public int getFirstColumnRaw()
	{
		return field_4_first_column;
	}

		field_4_first_column = column;
	}

	public int getLastColumn()
	{
		return field_5_last_column & 0xFF;
	}

	public int getLastColumnRaw()
	{
		return field_5_last_column;
	}

	 */
	public void setFirstRowRelative( boolean rel )
	{
		field_4_first_column = rowRelative.setBoolean( field_4_first_column, rel );
	}

	/**

	 */
	public void setFirstColRelative( boolean rel )
	{
		field_4_first_column = colRelative.setBoolean( field_4_first_column, rel );
	}

	/**

	 */
	public void setLastRowRelative( boolean rel )
	{
		field_5_last_column = rowRelative.setBoolean( field_5_last_column, rel );
	}

	/**

	 */
	public void setLastColRelative( boolean rel )
	{
		field_5_last_column = colRelative.setBoolean( field_5_last_column, rel );
	}



		CellReference frstCell = ar.getFirstCell();
		CellReference lastCell = ar.getLastCell();

		setFirstRow(	(short) frstCell.getRow() );
		setFirstColumn(		 frstCell.getCol() );
		setLastRow(	 (short) lastCell.getRow() );
		setLastColumn(		  lastCell.getCol() );
		setFirstColRelative( !frstCell.isColAbsolute() );
		setLastColRelative(  !lastCell.isColAbsolute() );
		setFirstRowRelative( !frstCell.isRowAbsolute() );
		setLastRowRelative(  !lastCell.isRowAbsolute() );
	}

	/**
	 * @return text representation of this area reference that can be used in text
	 *  formulas. The sheet name will get properly delimited if required.
	 */
	public String toFormulaString(Workbook book)
	{
		// First do the sheet name

		ptg.field_3_last_row = field_3_last_row;
		ptg.field_4_first_column = field_4_first_column;
		ptg.field_5_last_column = field_5_last_column;
		ptg.setClass(ptgClass);
		return ptg;
	}





    /**
     * @return the first row in the area
     */
    public int getFirstRow();

    /**
     * @return last row in the range (x2 in x1,y1-x2,y2)
     */
    public int getLastRow();
    
    /**
     * @return the first column number in the area.
     */
    public int getFirstColumn();
    
    /**
     * @return lastcolumn in the area
     */
    public int getLastColumn();
    
    /**
     * @return isrelative first column to relative or not





/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

   limitations under the License.
==================================================================== */

/*
 * ValueReferencePtg.java
 *
 * Created on November 21, 2001, 5:27 PM
 */
package org.apache.poi.hssf.record.formula;

import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.BitField;

import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.hssf.model.Workbook;

/**
 * RefNAPtg
 * @author Jason Height (jheight at chariot dot net dot au)
 */

public final class RefAPtg extends ReferencePtg {
{
    public final static byte sid  = 0x64;

    protected RefAPtg() {
      super();
    }

    public RefAPtg(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
      super(row, column, isRowRelative, isColumnRelative);
    }






/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with


package org.apache.poi.hssf.record.formula;

import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.BitField;

import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.hssf.model.Workbook;

/**
 * RefVPtg
 * @author Jason Height (jheight at chariot dot net dot au)
 */
public final class RefVPtg extends ReferencePtg {
public class RefVPtg extends ReferencePtg
{
  public final static byte sid  = 0x44;

  protected RefVPtg() {
    super();
  }

  public RefVPtg(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
    super(row, column, isRowRelative, isColumnRelative);
  }





 * @author Jason Height (jheight at chariot dot net dot au)
 */

public class ReferencePtg extends Ptg {
{
    private final static int SIZE = 5;
    public final static byte sid  = 0x24;
    private final static int MAX_ROW_NUMBER = 65536;             
    //public final static byte sid = 0x44;

   /** The row index - zero based unsigned 16 bit value */
    private int            field_1_row;
    /** Field 2 
     * - lower 8 bits is the zero based unsigned byte column index 
     * - bit 16 - isRowRelative
     * - bit 15 - isColumnRelative 
     */
    private int            field_2_col;
    private static final BitField         rowRelative = BitFieldFactory.getInstance(0x8000);
    private static final BitField         colRelative = BitFieldFactory.getInstance(0x4000);
    private static final BitField         column      = BitFieldFactory.getInstance(0x00FF);
    private short            field_2_col;
    private BitField         rowRelative = BitFieldFactory.getInstance(0x8000);
    private BitField         colRelative = BitFieldFactory.getInstance(0x4000);
    private BitField         column      = BitFieldFactory.getInstance(0x3FFF);

    protected ReferencePtg() {
      //Required for clone methods

     */
    public ReferencePtg(String cellref) {
        CellReference c= new CellReference(cellref);
        setRow(c.getRow());
        setColumn(c.getCol());
        setColRelative(!c.isColAbsolute());
        setRowRelative(!c.isRowAbsolute());
    }
    
    public ReferencePtg(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
      setRow(row);
      setColumn(column);
      setRowRelative(isRowRelative);


    public ReferencePtg(RecordInputStream in)
    {
        field_1_row = in.readUShort();
        field_2_col = in.readUShort();
    }
    
    public String getRefPtgName() {

    {
        array[offset] = (byte) (sid + ptgClass);

        LittleEndian.putShort(array, offset+1, (short)field_1_row);
        LittleEndian.putShort(array, offset+3, (short)field_2_col);
    }

    public void setRow(short row)
    {
        field_1_row = row;
    }
    public void setRow(int row)
    {
        if(row < 0 || row >= MAX_ROW_NUMBER) {
           throw new IllegalArgumentException("The row number, when specified as an integer, must be between 0 and " + MAX_ROW_NUMBER);
        }
        field_1_row = row;
        // Save, wrapping as needed
        if(row > Short.MAX_VALUE) {
        	field_1_row = (short)(row - MAX_ROW_NUMBER);
        } else {
        	field_1_row = (short)row;
        }
    }

    /**
     * Returns the row number as a short, which will be
     *  wrapped (negative) for values between 32769 and 65535
     */
    public int getRow()
    {
        return field_1_row;
    }

    }
    
    public void setRowRelative(boolean rel) {
        field_2_col=rowRelative.setBoolean(field_2_col,rel);
    }
    
    public boolean isColRelative()

    }
    
    public void setColRelative(boolean rel) {
        field_2_col=colRelative.setBoolean(field_2_col,rel);
    }

    public void setColumnRaw(int col)
    {
        field_2_col = col;
    }

    public int getColumnRaw()
    {
        return field_2_col;
    }

    public void setColumn(int col)
    {
        if(col < 0 || col > 0x100) {
            throw new IllegalArgumentException("Specified colIx (" + col + ") is out of range");
        }
    	field_2_col = column.setValue(field_2_col, col);
    }

    public int getColumn() {
    	return column.getValue(field_2_col);
    	return column.getShortValue(field_2_col);
    }

    public int getSize()





package org.apache.poi.hssf.record.formula;

import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
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.util.BitFieldFactory;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.hssf.record.RecordInputStream;

/**
 * Title:        Reference 3D Ptg <P>

    public final static byte sid  = 0x3a;
    private final static int  SIZE = 7; // 6 + 1 for Ptg
    private short             field_1_index_extern_sheet;
    /** The row index - zero based unsigned 16 bit value */
    private int            field_2_row;
    /** Field 2 
     * - lower 8 bits is the zero based unsigned byte column index 
     * - bit 16 - isRowRelative
     * - bit 15 - isColumnRelative 
     */
    private int             field_3_column;
    private BitField         rowRelative = BitFieldFactory.getInstance(0x8000);
    private BitField         colRelative = BitFieldFactory.getInstance(0x4000);


    
    public Ref3DPtg(String cellref, short externIdx ) {
        CellReference c= new CellReference(cellref);
        setRow(c.getRow());
        setColumn(c.getCol());
        setColRelative(!c.isColAbsolute());
        setRowRelative(!c.isRowAbsolute());   
        setExternSheetIndex(externIdx);

    public void writeBytes(byte [] array, int offset) {
        array[ 0 + offset ] = (byte) (sid + ptgClass);
        LittleEndian.putShort(array, 1 + offset , getExternSheetIndex());
        LittleEndian.putShort(array, 3 + offset , (short)getRow());
        LittleEndian.putShort(array, 5 + offset , (short)getColumnRaw());
    }

    public int getSize() {

        field_1_index_extern_sheet = index;
    }

    public int getRow() {
        return field_2_row;
    }

    public void setRow(int row) {
        field_2_row = row;
    }

    public int getColumn() {
        return field_3_column & 0xFF;
    }

    public int getColumnRaw() {
        return field_3_column;
    }


    }
    
    public void setRowRelative(boolean rel) {
        field_3_column=rowRelative.setBoolean(field_3_column,rel);
    }
    
    public boolean isColRelative()

    }
    
    public void setColRelative(boolean rel) {
        field_3_column=colRelative.setBoolean(field_3_column,rel);
    }
    public void setColumn(short column) {
        field_3_column &= 0xFF00;

     ptg.setClass(ptgClass);
     return ptg;
   }

}




 * @author Jason Height (jheight at chariot dot net dot au)
 */

public final class AreaAPtg extends AreaPtg {
    extends AreaPtg
{
    public final static short sid  = 0x65;

    protected AreaAPtg() {
      //Required for clone methods
    }

    public AreaAPtg(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
      super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
    }





* See the License for the specific language governing permissions and
* limitations under the License.
*/

 * Created on May 5, 2005
 *
 */
package org.apache.poi.hssf.usermodel;

import java.lang.reflect.Constructor;

            }
            else if (ptg instanceof ReferencePtg) {
                ReferencePtg refPtg = (ReferencePtg) ptg;
                int colIx = refPtg.getColumn();
                int rowIx = refPtg.getRow();
                HSSFRow row = sheet.getRow(rowIx);
                HSSFCell cell = (row != null) ? row.getCell(colIx) : null;
                stack.push(createRef2DEval(refPtg, cell, row, sheet, workbook));
            }
            else if (ptg instanceof Ref3DPtg) {
                Ref3DPtg refPtg = (Ref3DPtg) ptg;
                int colIx = refPtg.getColumn();
                int rowIx = refPtg.getRow();
                Workbook wb = workbook.getWorkbook();
                HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(refPtg.getExternSheetIndex()));
                HSSFRow row = xsheet.getRow(rowIx);
                HSSFCell cell = (row != null) ? row.getCell(colIx) : null;
                stack.push(createRef3DEval(refPtg, cell, row, xsheet, workbook));
            }
            else if (ptg instanceof AreaPtg) {

    }
    
    public static AreaEval evaluateAreaPtg(HSSFSheet sheet, HSSFWorkbook workbook, AreaPtg ap) {
        int row0 = ap.getFirstRow();
        int col0 = ap.getFirstColumn();
        int row1 = ap.getLastRow();
        int col1 = ap.getLastColumn();
        
        // If the last row is -1, then the
        //  reference is for the rest of the column

        if(row1 == -1 && row0 >= 0) {
            row1 = (short)sheet.getLastRowNum();
        }
        ValueEval[] values = evalArea(workbook, sheet, row0, col0, row1, col1);
        return new Area2DEval(ap, values);
        for (short x = row0; sheet != null && x < row1 + 1; x++) {
            HSSFRow row = sheet.getRow(x);
            for (short y = col0; row != null && y < col1 + 1; y++) {
                values[(x - row0) * (col1 - col0 + 1) + (y - col0)] = 
                    getEvalForCell(row.getCell(y), row, sheet, workbook);
            }
        }
        AreaEval ae = new Area2DEval(ap, values);
        return ae;
    }

    public static AreaEval evaluateArea3dPtg(HSSFWorkbook workbook, Area3DPtg a3dp) {
    	int row0 = a3dp.getFirstRow();
    	int col0 = a3dp.getFirstColumn();
    	int row1 = a3dp.getLastRow();
    	int col1 = a3dp.getLastColumn();
        Workbook wb = workbook.getWorkbook();
        HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(a3dp.getExternSheetIndex()));
        

            row1 = (short)xsheet.getLastRowNum();
        }
        
        ValueEval[] values = evalArea(workbook, xsheet, row0, col0, row1, col1);
        return new Area3DEval(a3dp, values);
    }
    
    private static ValueEval[] evalArea(HSSFWorkbook workbook, HSSFSheet sheet, 
    		int row0, int col0, int row1, int col1) {
        ValueEval[] values = new ValueEval[(row1 - row0 + 1) * (col1 - col0 + 1)];
        for (int x = row0; sheet != null && x < row1 + 1; x++) {
            HSSFRow row = sheet.getRow(x);
            for (int y = col0; y < col1 + 1; y++) {
                ValueEval cellEval;
                if(row == null) {
                	cellEval = BlankEval.INSTANCE;
                } else {
                	cellEval = getEvalForCell(row.getCell(y), row, sheet, workbook);
                }
				values[(x - row0) * (col1 - col0 + 1) + (y - col0)] = cellEval;
            }
        }
        return values;
        return ae;
    }


    /**
     * returns the OperationEval concrete impl instance corresponding
     * to the suplied operationPtg

Lines 14-23 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area2DEval.java (-23 / +32 lines)
14	* See the License for the specific language governing permissions and	14	* See the License for the specific language governing permissions and
15	* limitations under the License.	15	* limitations under the License.
16	*/	16	*/
17	/*	17
18	* Created on May 8, 2005
19	*
20	*/
21	package org.apache.poi.hssf.record.formula.eval;	18	package org.apache.poi.hssf.record.formula.eval;
22		19
23	import org.apache.poi.hssf.record.formula.AreaPtg;	20	import org.apache.poi.hssf.record.formula.AreaPtg;
Lines 27-74 Link Here
27	* @author Amol S. Deshmukh < amolweb at ya hoo dot com >	24	* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
28	*	25	*
29	*/	26	*/
30	public class Area2DEval implements AreaEval {	27	public final class Area2DEval implements AreaEval {
		28	// TODO -refactor with Area3DEval
		29	private final AreaPtg _delegate;
31		30
32	private AreaPtg delegate;	31	private final ValueEval[] _values;
33		32
34	private ValueEval[] values;
35
36	public Area2DEval(Ptg ptg, ValueEval[] values) {	33	public Area2DEval(Ptg ptg, ValueEval[] values) {
37	this.delegate = (AreaPtg) ptg;	34	if(ptg == null) {
38	this.values = values;	35	throw new IllegalArgumentException("ptg must not be null");
		36	}
		37	if(values == null) {
		38	throw new IllegalArgumentException("values must not be null");
		39	}
		40	for(int i=values.length-1; i>=0; i--) {
		41	if(values[i] == null) {
		42	throw new IllegalArgumentException("value array elements must not be null");
		43	}
		44	}
		45	// TODO - check size of array vs size of AreaPtg
		46	_delegate = (AreaPtg) ptg;
		47	_values = values;
39	}	48	}
40		49
41	public short getFirstColumn() {	50	public int getFirstColumn() {
42	return delegate.getFirstColumn();	51	return _delegate.getFirstColumn();
43	}	52	}
44		53
45	public int getFirstRow() {	54	public int getFirstRow() {
46	return delegate.getFirstRow();	55	return _delegate.getFirstRow();
47	}	56	}
48		57
49	public short getLastColumn() {	58	public int getLastColumn() {
50	return delegate.getLastColumn();	59	return _delegate.getLastColumn();
51	}	60	}
52		61
53	public int getLastRow() {	62	public int getLastRow() {
54	return delegate.getLastRow();	63	return _delegate.getLastRow();
55	}	64	}
56		65
57	public ValueEval[] getValues() {	66	public ValueEval[] getValues() {
58	return values;	67	return _values;
59	}	68	}
60		69
61	public ValueEval getValueAt(int row, short col) {	70	public ValueEval getValueAt(int row, int col) {
62	ValueEval retval;	71	ValueEval retval;
63	int index = ((row-getFirstRow())*(getLastColumn()-getFirstColumn()+1))+(col-getFirstColumn());	72	int index = ((row-getFirstRow())*(getLastColumn()-getFirstColumn()+1))+(col-getFirstColumn());
64	if (index <0 \|\| index >= values.length)	73	if (index <0 \|\| index >= _values.length)
65	retval = ErrorEval.VALUE_INVALID;	74	retval = ErrorEval.VALUE_INVALID;
66	else	75	else
67	retval = values[index];	76	retval = _values[index];
68	return retval;	77	return retval;
69	}	78	}
70		79
71	public boolean contains(int row, short col) {	80	public boolean contains(int row, int col) {
72	return (getFirstRow() <= row) && (getLastRow() >= row)	81	return (getFirstRow() <= row) && (getLastRow() >= row)
73	&& (getFirstColumn() <= col) && (getLastColumn() >= col);	82	&& (getFirstColumn() <= col) && (getLastColumn() >= col);
74	}	83	}
Lines 82-91 Link Here
82	}	91	}
83		92
84	public boolean isColumn() {	93	public boolean isColumn() {
85	return delegate.getFirstColumn() == delegate.getLastColumn();	94	return _delegate.getFirstColumn() == _delegate.getLastColumn();
86	}	95	}
87		96
88	public boolean isRow() {	97	public boolean isRow() {
89	return delegate.getFirstRow() == delegate.getLastRow();	98	return _delegate.getFirstRow() == _delegate.getLastRow();
90	}	99	}
91	}	100	}

Lines 14-23 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Area3DEval.java (-24 / +32 lines)
14	* See the License for the specific language governing permissions and	14	* See the License for the specific language governing permissions and
15	* limitations under the License.	15	* limitations under the License.
16	*/	16	*/
17	/*	17
18	* Created on May 8, 2005
19	*
20	*/
21	package org.apache.poi.hssf.record.formula.eval;	18	package org.apache.poi.hssf.record.formula.eval;
22		19
23	import org.apache.poi.hssf.record.formula.Area3DPtg;	20	import org.apache.poi.hssf.record.formula.Area3DPtg;
Lines 28-74 Link Here
28	*	25	*
29	*/	26	*/
30	public final class Area3DEval implements AreaEval {	27	public final class Area3DEval implements AreaEval {
		28	// TODO -refactor with Area3DEval
		29	private final Area3DPtg _delegate;
31		30
32	private Area3DPtg delegate;	31	private final ValueEval[] _values;
33		32
34	private ValueEval[] values;
35
36	public Area3DEval(Ptg ptg, ValueEval[] values) {	33	public Area3DEval(Ptg ptg, ValueEval[] values) {
37	this.values = values;	34	if(ptg == null) {
38	this.delegate = (Area3DPtg) ptg;	35	throw new IllegalArgumentException("ptg must not be null");
		36	}
		37	if(values == null) {
		38	throw new IllegalArgumentException("values must not be null");
		39	}
		40	for(int i=values.length-1; i>=0; i--) {
		41	if(values[i] == null) {
		42	throw new IllegalArgumentException("value array elements must not be null");
		43	}
		44	}
		45	// TODO - check size of array vs size of AreaPtg
		46	_values = values;
		47	_delegate = (Area3DPtg) ptg;
39	}	48	}
40		49
41	public short getFirstColumn() {	50	public int getFirstColumn() {
42	return delegate.getFirstColumn();	51	return _delegate.getFirstColumn();
43	}	52	}
44		53
45	public int getFirstRow() {	54	public int getFirstRow() {
46	return delegate.getFirstRow();	55	return _delegate.getFirstRow();
47	}	56	}
48		57
49	public short getLastColumn() {	58	public int getLastColumn() {
50	return delegate.getLastColumn();	59	return (short) _delegate.getLastColumn();
51	}	60	}
52		61
53	public int getLastRow() {	62	public int getLastRow() {
54	return delegate.getLastRow();	63	return _delegate.getLastRow();
55	}	64	}
56		65
57	public ValueEval[] getValues() {	66	public ValueEval[] getValues() {
58	return values;	67	return _values;
59	}	68	}
60		69
61	public ValueEval getValueAt(int row, short col) {	70	public ValueEval getValueAt(int row, int col) {
62	ValueEval retval;	71	ValueEval retval;
63	int index = (row-getFirstRow())*(col-getFirstColumn());	72	int index = (row-getFirstRow())*(col-getFirstColumn());
64	if (index <0 \|\| index >= values.length)	73	if (index <0 \|\| index >= _values.length)
65	retval = ErrorEval.VALUE_INVALID;	74	retval = ErrorEval.VALUE_INVALID;
66	else	75	else
67	retval = values[index];	76	retval = _values[index];
68	return retval;	77	return retval;
69	}	78	}
70		79
71	public boolean contains(int row, short col) {	80	public boolean contains(int row, int col) {
72	return (getFirstRow() <= row) && (getLastRow() >= row)	81	return (getFirstRow() <= row) && (getLastRow() >= row)
73	&& (getFirstColumn() <= col) && (getLastColumn() >= col);	82	&& (getFirstColumn() <= col) && (getLastColumn() >= col);
74	}	83	}
Lines 83-97 Link Here
83		92
84		93
85	public boolean isColumn() {	94	public boolean isColumn() {
86	return delegate.getFirstColumn() == delegate.getLastColumn();	95	return _delegate.getFirstColumn() == _delegate.getLastColumn();
87	}	96	}
88		97
89	public boolean isRow() {	98	public boolean isRow() {
90	return delegate.getFirstRow() == delegate.getLastRow();	99	return _delegate.getFirstRow() == _delegate.getLastRow();
91	}	100	}
92		101
93	public int getExternSheetIndex() {	102	public int getExternSheetIndex() {
94	return delegate.getExternSheetIndex();	103	return _delegate.getExternSheetIndex();
95	}	104	}
96
97	}	105	}




    private final ReferencePtg delegate;
    
    public Ref2DEval(ReferencePtg ptg, ValueEval ve) {
        if(ve == null) {
            throw new IllegalArgumentException("ve must not be null");
        }
        if(false && ptg == null) { // TODO - fix dodgy code in MultiOperandNumericFunction
            throw new IllegalArgumentException("ptg must not be null");
        }
        value = ve;
        delegate = ptg;
    }
    public ValueEval getInnerValueEval() {
        return value;
    }
    public int getRow() {
        return delegate.getRow();
    }
    public int getColumn() {
        return delegate.getColumn();
    }
}




    private final Ref3DPtg delegate;

    public Ref3DEval(Ref3DPtg ptg, ValueEval ve) {
        if(ve == null) {
            throw new IllegalArgumentException("ve must not be null");
        }
        if(ptg == null) {
            throw new IllegalArgumentException("ptg must not be null");
        }
        value = ve;
        delegate = ptg;
    }
    public ValueEval getInnerValueEval() {
        return value;
    }
    public int getRow() {
        return delegate.getRow();
    }
    public int getColumn() {
        return delegate.getColumn();
    }
    public int getExternSheetIndex() {




     * returns the 0-based index of the first col in
     * this area.
     */
    public int getFirstColumn();

    /**
     * returns the 0-based index of the last col in
     * this area.
     */
    public int getLastColumn();
    
    /**
     * returns true if the Area's start and end row indexes

     * @param row
     * @param col
     */
    public ValueEval getValueAt(int row, int col);
    
    /**
     * returns true if the cell at row and col specified 

     * @param row
     * @param col
     */
    public boolean contains(int row, int col);
    
    /**
     * returns true if the specified col is in range




    public ValueEval getInnerValueEval();

    /**
     * returns the zero based column index.
     */
    public int getColumn();

    /**
     * returns the zero based row index.
     */
    public int getRow();
}

Lines 287-294 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/functions/LookupUtils.java (-2 / +2 lines)
287	// It doesn't matter if eval is a 2D or 3D ref, because that detail is never asked of AreaEval.	287	// It doesn't matter if eval is a 2D or 3D ref, because that detail is never asked of AreaEval.
288	// This code only requires the value array item.	288	// This code only requires the value array item.
289	// anything would be ok for rowIx and colIx, but may as well get it right.	289	// anything would be ok for rowIx and colIx, but may as well get it right.
290	short rowIx = refEval.getRow();	290	int rowIx = refEval.getRow();
291	short colIx = refEval.getColumn();	291	int colIx = refEval.getColumn();
292	AreaPtg ap = new AreaPtg(rowIx, rowIx, colIx, colIx, false, false, false, false);	292	AreaPtg ap = new AreaPtg(rowIx, rowIx, colIx, colIx, false, false, false, false);
293	ValueEval value = refEval.getInnerValueEval();	293	ValueEval value = refEval.getInnerValueEval();
294	return new Area2DEval(ap, new ValueEval[] { value, });	294	return new Area2DEval(ap, new ValueEval[] { value, });





/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.hssf.model;

import junit.framework.TestCase;

import org.apache.poi.hssf.model.FormulaParser.FormulaParseException;
import org.apache.poi.hssf.record.formula.FuncVarPtg;
import org.apache.poi.hssf.record.formula.NamePtg;
import org.apache.poi.hssf.record.formula.Ptg;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFName;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator.CellValue;

/**
 * Test the low level formula parser functionality,
 *  but using parts which need to use the
 *  HSSFFormulaEvaluator, which is in scratchpad 
 */
public final class TestFormulaParserSP extends TestCase {

    public TestFormulaParserSP(String name) {
        super(name);
    }
	
	public void testWithNamedRange() throws Exception {
		HSSFWorkbook workbook = new HSSFWorkbook();
		FormulaParser fp;

		assertEquals(FuncVarPtg.class, ptgs[1].getClass());
	}

	public void testEvaluateFormulaWithRowBeyond32768_Bug44539() {
		
		HSSFWorkbook wb = new HSSFWorkbook();
		HSSFSheet sheet = wb.createSheet();
		wb.setSheetName(0, "Sheet1");
		
		HSSFRow row = sheet.createRow(0);
		HSSFCell cell = row.createCell((short)0);
		cell.setCellFormula("SUM(A32769:A32770)");

		// put some values in the cells to make the evaluation more interesting
		sheet.createRow(32768).createCell((short)0).setCellValue(31);
		sheet.createRow(32769).createCell((short)0).setCellValue(11);
		
		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(sheet, wb);
		fe.setCurrentRow(row);
		CellValue result;
		try {
			result = fe.evaluate(cell);
		} catch (FormulaParseException e) {
			if(e.getMessage().equals("Found reference to named range \"A\", but that named range wasn't defined!")) {
				fail("Identifed bug 44539");
			}
			throw new RuntimeException(e);
		}
		assertEquals(HSSFCell.CELL_TYPE_NUMERIC, result.getCellType());
		assertEquals(42.0, result.getNumberValue(), 0.0);
	}
}





/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

import junit.framework.AssertionFailedError;
import junit.framework.TestCase;

import org.apache.poi.hssf.model.FormulaParser.FormulaParseException;
import org.apache.poi.hssf.record.formula.AbstractFunctionPtg;
import org.apache.poi.hssf.record.formula.AddPtg;
import org.apache.poi.hssf.record.formula.AreaPtg;

 * Some tests are also done in scratchpad, if they need
 *  HSSFFormulaEvaluator, which is there
 */
public final class TestFormulaParser extends TestCase {

    public TestFormulaParser(String name) {
        super(name);
    }
    public void setUp(){
        
    }
    
    public void tearDown() {
        
    }
    /**
     * @return parsed token array already confirmed not <code>null</code>
     */

        try {
            parseFormula(formula);
            throw new AssertionFailedError("expected parse exception");
        } catch (FormulaParseException e) {
            // expected during successful test
            assertNotNull(e.getMessage());
        } catch (RuntimeException e) {
            e.printStackTrace();
            fail("Wrong exception:" + e.getMessage());
            return;
        }
    }

    public void testSetFormulaWithRowBeyond32768_Bug44539() {
        
        HSSFWorkbook wb = new HSSFWorkbook();
        HSSFSheet sheet = wb.createSheet();
        wb.setSheetName(0, "Sheet1");
        
        HSSFRow row = sheet.createRow(0);
        HSSFCell cell = row.createCell((short)0);
        cell.setCellFormula("SUM(A32769:A32770)");
        if("SUM(A-32767:A-32766)".equals(cell.getCellFormula())) {
            fail("Identified bug 44539");
        }
        assertEquals("SUM(A32769:A32770)", cell.getCellFormula());
    }
}




 *
 * @author Dmitriy Kumshayev
 */
public final class TestAreaPtg extends TestCase {
{

	AreaPtg relative;
	AreaPtg absolute;
	
	protected void setUp() {
	{
		super.setUp();
		short firstRow=5;
		short lastRow=13;
		short firstCol=7;

	}


	private static void resetColumns(AreaPtg aptg) {
		int fc = aptg.getFirstColumn();
		int lc = aptg.getLastColumn();
		short lc = aptg.getLastColumn();
		aptg.setFirstColumn(fc);
		aptg.setLastColumn(lc);
		assertEquals(fc , aptg.getFirstColumn() );

Return to bug 44539

Lines 14-23 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java (-39 / +36 lines)
14	* See the License for the specific language governing permissions and	14	* See the License for the specific language governing permissions and
15	* limitations under the License.	15	* limitations under the License.
16	*/	16	*/
17	/*	17
18	* Created on May 5, 2005
19	*
20	*/
21	package org.apache.poi.hssf.usermodel;	18	package org.apache.poi.hssf.usermodel;
22		19
23	import java.lang.reflect.Constructor;	20	import java.lang.reflect.Constructor;
Lines 420-439 Link Here
420	}	417	}
421	else if (ptg instanceof ReferencePtg) {	418	else if (ptg instanceof ReferencePtg) {
422	ReferencePtg refPtg = (ReferencePtg) ptg;	419	ReferencePtg refPtg = (ReferencePtg) ptg;
423	short colnum = refPtg.getColumn();	420	int colIx = refPtg.getColumn();
424	short rownum = refPtg.getRow();	421	int rowIx = refPtg.getRow();
425	HSSFRow row = sheet.getRow(rownum);	422	HSSFRow row = sheet.getRow(rowIx);
426	HSSFCell cell = (row != null) ? row.getCell(colnum) : null;	423	HSSFCell cell = (row != null) ? row.getCell(colIx) : null;
427	stack.push(createRef2DEval(refPtg, cell, row, sheet, workbook));	424	stack.push(createRef2DEval(refPtg, cell, row, sheet, workbook));
428	}	425	}
429	else if (ptg instanceof Ref3DPtg) {	426	else if (ptg instanceof Ref3DPtg) {
430	Ref3DPtg refPtg = (Ref3DPtg) ptg;	427	Ref3DPtg refPtg = (Ref3DPtg) ptg;
431	short colnum = refPtg.getColumn();	428	int colIx = refPtg.getColumn();
432	short rownum = refPtg.getRow();	429	int rowIx = refPtg.getRow();
433	Workbook wb = workbook.getWorkbook();	430	Workbook wb = workbook.getWorkbook();
434	HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(refPtg.getExternSheetIndex()));	431	HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(refPtg.getExternSheetIndex()));
435	HSSFRow row = xsheet.getRow(rownum);	432	HSSFRow row = xsheet.getRow(rowIx);
436	HSSFCell cell = (row != null) ? row.getCell(colnum) : null;	433	HSSFCell cell = (row != null) ? row.getCell(colIx) : null;
437	stack.push(createRef3DEval(refPtg, cell, row, xsheet, workbook));	434	stack.push(createRef3DEval(refPtg, cell, row, xsheet, workbook));
438	}	435	}
439	else if (ptg instanceof AreaPtg) {	436	else if (ptg instanceof AreaPtg) {
Lines 506-515 Link Here
506	}	503	}
507		504
508	public static AreaEval evaluateAreaPtg(HSSFSheet sheet, HSSFWorkbook workbook, AreaPtg ap) {	505	public static AreaEval evaluateAreaPtg(HSSFSheet sheet, HSSFWorkbook workbook, AreaPtg ap) {
509	short row0 = ap.getFirstRow();	506	int row0 = ap.getFirstRow();
510	short col0 = ap.getFirstColumn();	507	int col0 = ap.getFirstColumn();
511	short row1 = ap.getLastRow();	508	int row1 = ap.getLastRow();
512	short col1 = ap.getLastColumn();	509	int col1 = ap.getLastColumn();
513		510
514	// If the last row is -1, then the	511	// If the last row is -1, then the
515	// reference is for the rest of the column	512	// reference is for the rest of the column
Lines 518-541 Link Here
518	if(row1 == -1 && row0 >= 0) {	515	if(row1 == -1 && row0 >= 0) {
519	row1 = (short)sheet.getLastRowNum();	516	row1 = (short)sheet.getLastRowNum();
520	}	517	}
521		518	ValueEval[] values = evalArea(workbook, sheet, row0, col0, row1, col1);
522	ValueEval[] values = new ValueEval[(row1 - row0 + 1) * (col1 - col0 + 1)];	519	return new Area2DEval(ap, values);
523	for (short x = row0; sheet != null && x < row1 + 1; x++) {
524	HSSFRow row = sheet.getRow(x);
525	for (short y = col0; row != null && y < col1 + 1; y++) {
526	values[(x - row0) * (col1 - col0 + 1) + (y - col0)] =
527	getEvalForCell(row.getCell(y), row, sheet, workbook);
528	}
529	}
530	AreaEval ae = new Area2DEval(ap, values);
531	return ae;
532	}	520	}
533		521
534	public static AreaEval evaluateArea3dPtg(HSSFWorkbook workbook, Area3DPtg a3dp) {	522	public static AreaEval evaluateArea3dPtg(HSSFWorkbook workbook, Area3DPtg a3dp) {
535	short row0 = a3dp.getFirstRow();	523	int row0 = a3dp.getFirstRow();
536	short col0 = a3dp.getFirstColumn();	524	int col0 = a3dp.getFirstColumn();
537	short row1 = a3dp.getLastRow();	525	int row1 = a3dp.getLastRow();
538	short col1 = a3dp.getLastColumn();	526	int col1 = a3dp.getLastColumn();
539	Workbook wb = workbook.getWorkbook();	527	Workbook wb = workbook.getWorkbook();
540	HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(a3dp.getExternSheetIndex()));	528	HSSFSheet xsheet = workbook.getSheetAt(wb.getSheetIndexFromExternSheetIndex(a3dp.getExternSheetIndex()));
541		529
Lines 547-565 Link Here
547	row1 = (short)xsheet.getLastRowNum();	535	row1 = (short)xsheet.getLastRowNum();
548	}	536	}
549		537
		538	ValueEval[] values = evalArea(workbook, xsheet, row0, col0, row1, col1);
		539	return new Area3DEval(a3dp, values);
		540	}
		541
		542	private static ValueEval[] evalArea(HSSFWorkbook workbook, HSSFSheet sheet,
		543	int row0, int col0, int row1, int col1) {
550	ValueEval[] values = new ValueEval[(row1 - row0 + 1) * (col1 - col0 + 1)];	544	ValueEval[] values = new ValueEval[(row1 - row0 + 1) * (col1 - col0 + 1)];
551	for (short x = row0; xsheet != null && x < row1 + 1; x++) {	545	for (int x = row0; sheet != null && x < row1 + 1; x++) {
552	HSSFRow row = xsheet.getRow(x);	546	HSSFRow row = sheet.getRow(x);
553	for (short y = col0; row != null && y < col1 + 1; y++) {	547	for (int y = col0; y < col1 + 1; y++) {
554	values[(x - row0) * (col1 - col0 + 1) + (y - col0)] =	548	ValueEval cellEval;
555	getEvalForCell(row.getCell(y), row, xsheet, workbook);	549	if(row == null) {
		550	cellEval = BlankEval.INSTANCE;
		551	} else {
		552	cellEval = getEvalForCell(row.getCell(y), row, sheet, workbook);
		553	}
		554	values[(x - row0) * (col1 - col0 + 1) + (y - col0)] = cellEval;
556	}	555	}
557	}	556	}
558	AreaEval ae = new Area3DEval(a3dp, values);	557	return values;
559	return ae;
560	}	558	}
561		559
562
563	/**	560	/**
564	* returns the OperationEval concrete impl instance corresponding	561	* returns the OperationEval concrete impl instance corresponding
565	* to the suplied operationPtg	562	* to the suplied operationPtg

Lines 1-4 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java (-44 / +40 lines)
1
2	/* ====================================================================	1	/* ====================================================================
3	Licensed to the Apache Software Foundation (ASF) under one or more	2	Licensed to the Apache Software Foundation (ASF) under one or more
4	contributor license agreements. See the NOTICE file distributed with	3	contributor license agreements. See the NOTICE file distributed with
Lines 15-22 Link Here
15	See the License for the specific language governing permissions and	14	See the License for the specific language governing permissions and
16	limitations under the License.	15	limitations under the License.
17	==================================================================== */	16	==================================================================== */
18		17
19
20	package org.apache.poi.hssf.record;	18	package org.apache.poi.hssf.record;
21		19
22	import java.util.Stack;	20	import java.util.Stack;
Lines 34-43 Link Here
34	* record types.	32	* record types.
35	* @author Danny Mui at apache dot org	33	* @author Danny Mui at apache dot org
36	*/	34	*/
37		35	public final class SharedFormulaRecord extends Record {
38	public class SharedFormulaRecord
39	extends Record
40	{
41	public final static short sid = 0x4BC;	36	public final static short sid = 0x4BC;
42		37
43	private int field_1_first_row;	38	private int field_1_first_row;
Lines 58-72 Link Here
58		53
59	public SharedFormulaRecord(RecordInputStream in)	54	public SharedFormulaRecord(RecordInputStream in)
60	{	55	{
61	super(in);	56	super(in);
62	}	57	}
63		58
64	protected void validateSid(short id)	59	protected void validateSid(short id)
65	{	60	{
66	if (id != this.sid)	61	if (id != this.sid)
67	{	62	{
68	throw new RecordFormatException("Not a valid SharedFormula");	63	throw new RecordFormatException("Not a valid SharedFormula");
69	}	64	}
70	}	65	}
71		66
72	public int getFirstRow() {	67	public int getFirstRow() {
Lines 96-109 Link Here
96		91
97	public int serialize(int offset, byte [] data)	92	public int serialize(int offset, byte [] data)
98	{	93	{
99	//Because this record is converted to individual Formula records, this method is not required.	94	//Because this record is converted to individual Formula records, this method is not required.
100	throw new UnsupportedOperationException("Cannot serialize a SharedFormulaRecord");	95	throw new UnsupportedOperationException("Cannot serialize a SharedFormulaRecord");
101	}	96	}
102		97
103	public int getRecordSize()	98	public int getRecordSize()
104	{	99	{
105	//Because this record is converted to individual Formula records, this method is not required.	100	//Because this record is converted to individual Formula records, this method is not required.
106	throw new UnsupportedOperationException("Cannot get the size for a SharedFormulaRecord");	101	throw new UnsupportedOperationException("Cannot get the size for a SharedFormulaRecord");
107		102
108	}	103	}
109		104
Lines 257-295 Link Here
257	}	252	}
258	}	253	}
259		254
260	private short fixupRelativeColumn(int currentcolumn, short column, boolean relative) {	255	private int fixupRelativeColumn(int currentcolumn, int column, boolean relative) {
261	if(relative) {	256	if(relative) {
262	if((column&128)!=0) column=(short)(column-256);	257	// mask out upper bits to produce 'wrapping' at column 256 ("IV")
263	column+=currentcolumn;	258	return (column + currentcolumn) & 0x00FF;
264	}	259	}
265	return column;	260	return column;
266	}	261	}
267		262
268	private short fixupRelativeRow(int currentrow, short row, boolean relative) {	263	private int fixupRelativeRow(int currentrow, int row, boolean relative) {
269	if(relative) {	264	if(relative) {
270	row+=currentrow;	265	// mask out upper bits to produce 'wrapping' at row 65536
271	}	266	return (row+currentrow) & 0x00FFFF;
272	return row;	267	}
273	}	268	return row;
		269	}
274		270
275	/**	271	/**
276	* Mirroring formula records so it is registered in the ValueRecordsAggregate	272	* Mirroring formula records so it is registered in the ValueRecordsAggregate
277	*/	273	*/
278	public boolean isInValueSection()	274	public boolean isInValueSection()
279	{	275	{
280	return true;	276	return true;
281	}	277	}
282		278
283		279
284	/**	280	/**
285	* Register it in the ValueRecordsAggregate so it can go into the FormulaRecordAggregate	281	* Register it in the ValueRecordsAggregate so it can go into the FormulaRecordAggregate
286	*/	282	*/
287	public boolean isValue() {	283	public boolean isValue() {
288	return true;	284	return true;
289	}	285	}
290		286
291	public Object clone() {	287	public Object clone() {
292	//Because this record is converted to individual Formula records, this method is not required.	288	//Because this record is converted to individual Formula records, this method is not required.
293	throw new UnsupportedOperationException("Cannot clone a SharedFormulaRecord");	289	throw new UnsupportedOperationException("Cannot clone a SharedFormulaRecord");
294	}	290	}
295	}	291	}

Lines 41-50 Link Here

(-)C:\josh\source\poi\subv\trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java (-49 / +49 lines)
41	public final static byte sid = 0x3b;	41	public final static byte sid = 0x3b;
42	private final static int SIZE = 11; // 10 + 1 for Ptg	42	private final static int SIZE = 11; // 10 + 1 for Ptg
43	private short field_1_index_extern_sheet;	43	private short field_1_index_extern_sheet;
44	private short field_2_first_row;	44	private int field_2_first_row;
45	private short field_3_last_row;	45	private int field_3_last_row;
46	private short field_4_first_column;	46	private int field_4_first_column;
47	private short field_5_last_column;	47	private int field_5_last_column;
48		48
49	private BitField rowRelative = BitFieldFactory.getInstance( 0x8000 );	49	private BitField rowRelative = BitFieldFactory.getInstance( 0x8000 );
50	private BitField colRelative = BitFieldFactory.getInstance( 0x4000 );	50	private BitField colRelative = BitFieldFactory.getInstance( 0x4000 );
Lines 64-90 Link Here
64	public Area3DPtg(RecordInputStream in)	64	public Area3DPtg(RecordInputStream in)
65	{	65	{
66	field_1_index_extern_sheet = in.readShort();	66	field_1_index_extern_sheet = in.readShort();
67	field_2_first_row = in.readShort();	67	field_2_first_row = in.readUShort();
68	field_3_last_row = in.readShort();	68	field_3_last_row = in.readUShort();
69	field_4_first_column = in.readShort();	69	field_4_first_column = in.readUShort();
70	field_5_last_column = in.readShort();	70	field_5_last_column = in.readUShort();
71	}	71	}
72		72
73	public Area3DPtg(short firstRow, short lastRow, short firstColumn, short lastColumn,	73	public Area3DPtg(short firstRow, short lastRow, short firstColumn, short lastColumn,
74	boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative,	74	boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative,
75	short externalSheetIndex) {	75	short externalSheetIndex) {
76	setFirstRow(firstRow);	76	setFirstRow(firstRow);
77	setLastRow(lastRow);	77	setLastRow(lastRow);
78	setFirstColumn(firstColumn);	78	setFirstColumn(firstColumn);
79	setLastColumn(lastColumn);	79	setLastColumn(lastColumn);
80	setFirstRowRelative(firstRowRelative);	80	setFirstRowRelative(firstRowRelative);
81	setLastRowRelative(lastRowRelative);	81	setLastRowRelative(lastRowRelative);
82	setFirstColRelative(firstColRelative);	82	setFirstColRelative(firstColRelative);
83	setLastColRelative(lastColRelative);	83	setLastColRelative(lastColRelative);
84	setExternSheetIndex(externalSheetIndex);	84	setExternSheetIndex(externalSheetIndex);
85	}	85	}
86		86
87	public String toString()	87	public String toString()
88	{	88	{
89	StringBuffer buffer = new StringBuffer();	89	StringBuffer buffer = new StringBuffer();
90		90
Lines 99-105 Link Here
99	buffer.append( "lastColRowRel = "	99	buffer.append( "lastColRowRel = "
100	+ isLastRowRelative() ).append( "\n" );	100	+ isLastRowRelative() ).append( "\n" );
101	buffer.append( "firstColRel = " + isFirstColRelative() ).append( "\n" );	101	buffer.append( "firstColRel = " + isFirstColRelative() ).append( "\n" );
102	buffer.append( "lastColRel = " + isLastColRelative() ).append( "\n" );	102	buffer.append( "lastColRel = " + isLastColRelative() ).append( "\n" );
103	return buffer.toString();	103	return buffer.toString();
104	}	104	}
105		105
Lines 107-116 Link Here
107	{	107	{
108	array[0 + offset] = (byte) ( sid + ptgClass );	108	array[0 + offset] = (byte) ( sid + ptgClass );
109	LittleEndian.putShort( array, 1 + offset, getExternSheetIndex() );	109	LittleEndian.putShort( array, 1 + offset, getExternSheetIndex() );
110	LittleEndian.putShort( array, 3 + offset, getFirstRow() );	110	LittleEndian.putShort( array, 3 + offset, (short)getFirstRow() );
111	LittleEndian.putShort( array, 5 + offset, getLastRow() );	111	LittleEndian.putShort( array, 5 + offset, (short)getLastRow() );
112	LittleEndian.putShort( array, 7 + offset, getFirstColumnRaw() );	112	LittleEndian.putShort( array, 7 + offset, (short)getFirstColumnRaw() );
113	LittleEndian.putShort( array, 9 + offset, getLastColumnRaw() );	113	LittleEndian.putShort( array, 9 + offset, (short)getLastColumnRaw() );
114	}	114	}
115		115
116	public int getSize()	116	public int getSize()
Lines 128-159 Link Here
128	field_1_index_extern_sheet = index;	128	field_1_index_extern_sheet = index;
129	}	129	}
130		130
131	public short getFirstRow()	131	public int getFirstRow()
132	{	132	{
133	return field_2_first_row;	133	return field_2_first_row;
134	}	134	}
135		135
136	public void setFirstRow( short row )	136	public void setFirstRow( int row )
137	{	137	{
138	field_2_first_row = row;	138	field_2_first_row = row;
139	}	139	}
140		140
141	public short getLastRow()	141	public int getLastRow()
142	{	142	{
143	return field_3_last_row;	143	return field_3_last_row;
144	}	144	}
145		145
146	public void setLastRow( short row )	146	public void setLastRow( int row )
147	{	147	{
148	field_3_last_row = row;	148	field_3_last_row = row;
149	}	149	}
150		150
151	public short getFirstColumn()	151	public int getFirstColumn()
152	{	152	{
153	return (short) ( field_4_first_column & 0xFF );	153	return field_4_first_column & 0xFF;
154	}	154	}
155		155
156	public short getFirstColumnRaw()	156	public int getFirstColumnRaw()
157	{	157	{
158	return field_4_first_column;	158	return field_4_first_column;
159	}	159	}
Lines 179-190 Link Here
179	field_4_first_column = column;	179	field_4_first_column = column;
180	}	180	}
181		181
182	public short getLastColumn()	182	public int getLastColumn()
183	{	183	{
184	return (short) ( field_5_last_column & 0xFF );	184	return field_5_last_column & 0xFF;
185	}	185	}
186		186
187	public short getLastColumnRaw()	187	public int getLastColumnRaw()
188	{	188	{
189	return field_5_last_column;	189	return field_5_last_column;
190	}	190	}
Lines 216-222 Link Here
216	*/	216	*/
217	public void setFirstRowRelative( boolean rel )	217	public void setFirstRowRelative( boolean rel )
218	{	218	{
219	field_4_first_column = rowRelative.setShortBoolean( field_4_first_column, rel );	219	field_4_first_column = rowRelative.setBoolean( field_4_first_column, rel );
220	}	220	}
221		221
222	/**	222	/**
Lines 224-230 Link Here
224	*/	224	*/
225	public void setFirstColRelative( boolean rel )	225	public void setFirstColRelative( boolean rel )
226	{	226	{
227	field_4_first_column = colRelative.setShortBoolean( field_4_first_column, rel );	227	field_4_first_column = colRelative.setBoolean( field_4_first_column, rel );
228	}	228	}
229		229
230	/**	230	/**
Lines 233-239 Link Here
233	*/	233	*/
234	public void setLastRowRelative( boolean rel )	234	public void setLastRowRelative( boolean rel )
235	{	235	{
236	field_5_last_column = rowRelative.setShortBoolean( field_5_last_column, rel );	236	field_5_last_column = rowRelative.setBoolean( field_5_last_column, rel );
237	}	237	}
238		238
239	/**	239	/**
Lines 241-247 Link Here
241	*/	241	*/
242	public void setLastColRelative( boolean rel )	242	public void setLastColRelative( boolean rel )
243	{	243	{
244	field_5_last_column = colRelative.setShortBoolean( field_5_last_column, rel );	244	field_5_last_column = colRelative.setBoolean( field_5_last_column, rel );
245	}	245	}
246		246
247		247
Lines 259-278 Link Here
259	CellReference frstCell = ar.getFirstCell();	259	CellReference frstCell = ar.getFirstCell();
260	CellReference lastCell = ar.getLastCell();	260	CellReference lastCell = ar.getLastCell();
261		261
262	setFirstRow( (short) frstCell.getRow() );	262	setFirstRow( (short) frstCell.getRow() );
263	setFirstColumn( frstCell.getCol() );	263	setFirstColumn( frstCell.getCol() );
264	setLastRow( (short) lastCell.getRow() );	264	setLastRow( (short) lastCell.getRow() );
265	setLastColumn( lastCell.getCol() );	265	setLastColumn( lastCell.getCol() );
266	setFirstColRelative( !frstCell.isColAbsolute() );	266	setFirstColRelative( !frstCell.isColAbsolute() );
267	setLastColRelative( !lastCell.isColAbsolute() );	267	setLastColRelative( !lastCell.isColAbsolute() );
268	setFirstRowRelative( !frstCell.isRowAbsolute() );	268	setFirstRowRelative( !frstCell.isRowAbsolute() );
269	setLastRowRelative( !lastCell.isRowAbsolute() );	269	setLastRowRelative( !lastCell.isRowAbsolute() );
270	}	270	}
271		271
272	/**	272	/**
273	* @return text representation of this area reference that can be used in text	273	* @return text representation of this area reference that can be used in text
274	* formulas. The sheet name will get properly delimited if required.	274	* formulas. The sheet name will get properly delimited if required.
275	*/	275	*/
276	public String toFormulaString(Workbook book)	276	public String toFormulaString(Workbook book)
277	{	277	{
278	// First do the sheet name	278	// First do the sheet name
Lines 303-309 Link Here
303	ptg.field_3_last_row = field_3_last_row;	303	ptg.field_3_last_row = field_3_last_row;
304	ptg.field_4_first_column = field_4_first_column;	304	ptg.field_4_first_column = field_4_first_column;
305	ptg.field_5_last_column = field_5_last_column;	305	ptg.field_5_last_column = field_5_last_column;
306	ptg.setClass(ptgClass);	306	ptg.setClass(ptgClass);
307	return ptg;	307	return ptg;
308	}	308	}
309		309

Lines 29-44 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref2DEval.java (-2 / +8 lines)
29	private final ReferencePtg delegate;	29	private final ReferencePtg delegate;
30		30
31	public Ref2DEval(ReferencePtg ptg, ValueEval ve) {	31	public Ref2DEval(ReferencePtg ptg, ValueEval ve) {
		32	if(ve == null) {
		33	throw new IllegalArgumentException("ve must not be null");
		34	}
		35	if(false && ptg == null) { // TODO - fix dodgy code in MultiOperandNumericFunction
		36	throw new IllegalArgumentException("ptg must not be null");
		37	}
32	value = ve;	38	value = ve;
33	delegate = ptg;	39	delegate = ptg;
34	}	40	}
35	public ValueEval getInnerValueEval() {	41	public ValueEval getInnerValueEval() {
36	return value;	42	return value;
37	}	43	}
38	public short getRow() {	44	public int getRow() {
39	return delegate.getRow();	45	return delegate.getRow();
40	}	46	}
41	public short getColumn() {	47	public int getColumn() {
42	return delegate.getColumn();	48	return delegate.getColumn();
43	}	49	}
44	}	50	}

Lines 29-44 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/Ref3DEval.java (-2 / +8 lines)
29	private final Ref3DPtg delegate;	29	private final Ref3DPtg delegate;
30		30
31	public Ref3DEval(Ref3DPtg ptg, ValueEval ve) {	31	public Ref3DEval(Ref3DPtg ptg, ValueEval ve) {
		32	if(ve == null) {
		33	throw new IllegalArgumentException("ve must not be null");
		34	}
		35	if(ptg == null) {
		36	throw new IllegalArgumentException("ptg must not be null");
		37	}
32	value = ve;	38	value = ve;
33	delegate = ptg;	39	delegate = ptg;
34	}	40	}
35	public ValueEval getInnerValueEval() {	41	public ValueEval getInnerValueEval() {
36	return value;	42	return value;
37	}	43	}
38	public short getRow() {	44	public int getRow() {
39	return delegate.getRow();	45	return delegate.getRow();
40	}	46	}
41	public short getColumn() {	47	public int getColumn() {
42	return delegate.getColumn();	48	return delegate.getColumn();
43	}	49	}
44	public int getExternSheetIndex() {	50	public int getExternSheetIndex() {

Lines 42-54 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/AreaEval.java (-4 / +4 lines)
42	* returns the 0-based index of the first col in	42	* returns the 0-based index of the first col in
43	* this area.	43	* this area.
44	*/	44	*/
45	public short getFirstColumn();	45	public int getFirstColumn();
46		46
47	/**	47	/**
48	* returns the 0-based index of the last col in	48	* returns the 0-based index of the last col in
49	* this area.	49	* this area.
50	*/	50	*/
51	public short getLastColumn();	51	public int getLastColumn();
52		52
53	/**	53	/**
54	* returns true if the Area's start and end row indexes	54	* returns true if the Area's start and end row indexes
Lines 80-86 Link Here
80	* @param row	80	* @param row
81	* @param col	81	* @param col
82	*/	82	*/
83	public ValueEval getValueAt(int row, short col);	83	public ValueEval getValueAt(int row, int col);
84		84
85	/**	85	/**
86	* returns true if the cell at row and col specified	86	* returns true if the cell at row and col specified
Lines 89-95 Link Here
89	* @param row	89	* @param row
90	* @param col	90	* @param col
91	*/	91	*/
92	public boolean contains(int row, short col);	92	public boolean contains(int row, int col);
93		93
94	/**	94	/**
95	* returns true if the specified col is in range	95	* returns true if the specified col is in range

Lines 40-51 Link Here

(-)C:\josh\source\poi\subv\trunk/src/scratchpad/src/org/apache/poi/hssf/record/formula/eval/RefEval.java (-4 / +4 lines)
40	public ValueEval getInnerValueEval();	40	public ValueEval getInnerValueEval();
41		41
42	/**	42	/**
43	* returns the column index.	43	* returns the zero based column index.
44	*/	44	*/
45	public short getColumn();	45	public int getColumn();
46		46
47	/**	47	/**
48	* returns the row index.	48	* returns the zero based row index.
49	*/	49	*/
50	public short getRow();	50	public int getRow();
51	}	51	}

Lines 1-4 Link Here

(-)C:\josh\source\poi\subv\trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java (-15 / +22 lines)
1
2	/* ====================================================================	1	/* ====================================================================
3	Licensed to the Apache Software Foundation (ASF) under one or more	2	Licensed to the Apache Software Foundation (ASF) under one or more
4	contributor license agreements. See the NOTICE file distributed with	3	contributor license agreements. See the NOTICE file distributed with
Lines 21-26 Link Here
21	import junit.framework.AssertionFailedError;	20	import junit.framework.AssertionFailedError;
22	import junit.framework.TestCase;	21	import junit.framework.TestCase;
23		22
		23	import org.apache.poi.hssf.model.FormulaParser.FormulaParseException;
24	import org.apache.poi.hssf.record.formula.AbstractFunctionPtg;	24	import org.apache.poi.hssf.record.formula.AbstractFunctionPtg;
25	import org.apache.poi.hssf.record.formula.AddPtg;	25	import org.apache.poi.hssf.record.formula.AddPtg;
26	import org.apache.poi.hssf.record.formula.AreaPtg;	26	import org.apache.poi.hssf.record.formula.AreaPtg;
Lines 59-76 Link Here
59	* Some tests are also done in scratchpad, if they need	59	* Some tests are also done in scratchpad, if they need
60	* HSSFFormulaEvaluator, which is there	60	* HSSFFormulaEvaluator, which is there
61	*/	61	*/
62	public class TestFormulaParser extends TestCase {	62	public final class TestFormulaParser extends TestCase {
63		63
64	public TestFormulaParser(String name) {
65	super(name);
66	}
67	public void setUp(){
68
69	}
70
71	public void tearDown() {
72
73	}
74	/**	64	/**
75	* @return parsed token array already confirmed not <code>null</code>	65	* @return parsed token array already confirmed not <code>null</code>
76	*/	66	*/
Lines 831-840 Link Here
831	try {	821	try {
832	parseFormula(formula);	822	parseFormula(formula);
833	throw new AssertionFailedError("expected parse exception");	823	throw new AssertionFailedError("expected parse exception");
		824	} catch (FormulaParseException e) {
		825	// expected during successful test
		826	assertNotNull(e.getMessage());
834	} catch (RuntimeException e) {	827	} catch (RuntimeException e) {
835	// TODO - catch more specific exception	828	e.printStackTrace();
836	// expected during successful test	829	fail("Wrong exception:" + e.getMessage());
837	return;
838	}	830	}
839	}	831	}
		832
		833	public void testSetFormulaWithRowBeyond32768_Bug44539() {
		834
		835	HSSFWorkbook wb = new HSSFWorkbook();
		836	HSSFSheet sheet = wb.createSheet();
		837	wb.setSheetName(0, "Sheet1");
		838
		839	HSSFRow row = sheet.createRow(0);
		840	HSSFCell cell = row.createCell((short)0);
		841	cell.setCellFormula("SUM(A32769:A32770)");
		842	if("SUM(A-32767:A-32766)".equals(cell.getCellFormula())) {
		843	fail("Identified bug 44539");
		844	}
		845	assertEquals("SUM(A32769:A32770)", cell.getCellFormula());
		846	}
840	}	847	}

Lines 27-41 Link Here

(-)C:\josh\source\poi\subv\trunk/src/testcases/org/apache/poi/hssf/record/formula/TestAreaPtg.java (-9 / +5 lines)
27	*	27	*
28	* @author Dmitriy Kumshayev	28	* @author Dmitriy Kumshayev
29	*/	29	*/
30	public class TestAreaPtg extends TestCase	30	public final class TestAreaPtg extends TestCase {
31	{
32		31
33	AreaPtg relative;	32	AreaPtg relative;
34	AreaPtg absolute;	33	AreaPtg absolute;
35		34
36	protected void setUp() throws Exception	35	protected void setUp() {
37	{
38	super.setUp();
39	short firstRow=5;	36	short firstRow=5;
40	short lastRow=13;	37	short lastRow=13;
41	short firstCol=7;	38	short firstCol=7;
Lines 64-73 Link Here
64	}	61	}
65		62
66		63
67	public void resetColumns(AreaPtg aptg)	64	private static void resetColumns(AreaPtg aptg) {
68	{	65	int fc = aptg.getFirstColumn();
69	short fc = aptg.getFirstColumn();	66	int lc = aptg.getLastColumn();
70	short lc = aptg.getLastColumn();
71	aptg.setFirstColumn(fc);	67	aptg.setFirstColumn(fc);
72	aptg.setLastColumn(lc);	68	aptg.setLastColumn(lc);
73	assertEquals(fc , aptg.getFirstColumn() );	69	assertEquals(fc , aptg.getFirstColumn() );