moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix for bug 7653

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352305 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Glen Stampoultzis 2002-04-01 11:17:32 +00:00
parent 90a0ba3aa6
commit eebe2aedde
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
View File

@ -73,6 +73,7 @@ import java.util.Iterator;
* Only rows that have cells should be added to a Sheet. * Only rows that have cells should be added to a Sheet.
* @version 1.0-pre * @version 1.0-pre
* @author Andrew C. Oliver (acoliver at apache dot org) * @author Andrew C. Oliver (acoliver at apache dot org)
* @author Glen Stampoultzis (glens at apache.org)
*/ */
public class HSSFRow public class HSSFRow
@ -83,8 +84,8 @@ public class HSSFRow
public final static int INITIAL_CAPACITY = 5; public final static int INITIAL_CAPACITY = 5;
private short rowNum; private short rowNum;
private HashMap cells; private HashMap cells;
private short firstcell = -1; // private short firstcell = -1;
private short lastcell = -1; // private short lastcell = -1;
/** /**
* reference to low level representation * reference to low level representation
@ -125,6 +126,8 @@ public class HSSFRow
this.sheet = sheet; this.sheet = sheet;
row = new RowRecord(); row = new RowRecord();
row.setHeight((short) 0xff); row.setHeight((short) 0xff);
row.setLastCol((short)-1);
row.setFirstCol((short)-1);
// row.setRowNumber(rowNum); // row.setRowNumber(rowNum);
setRowNum(rowNum); setRowNum(rowNum);
@ -201,7 +204,6 @@ public class HSSFRow
* remove the HSSFCell from this row. * remove the HSSFCell from this row.
* @param cell to remove * @param cell to remove
*/ */
public void removeCell(HSSFCell cell) public void removeCell(HSSFCell cell)
{ {
CellValueRecordInterface cval = cell.getCellValueRecord(); CellValueRecordInterface cval = cell.getCellValueRecord();
@ -209,12 +211,12 @@ public class HSSFRow
sheet.removeValueRecord(getRowNum(), cval); sheet.removeValueRecord(getRowNum(), cval);
cells.remove(new Integer(cell.getCellNum())); cells.remove(new Integer(cell.getCellNum()));
if (cell.getCellNum() == lastcell) if (cell.getCellNum() == row.getLastCol())
{ {
lastcell = findLastCell(lastcell); row.setLastCol( findLastCell(row.getLastCol()) );
} else if (cell.getCellNum() == firstcell) } else if (cell.getCellNum() == row.getFirstCol())
{ {
firstcell = findFirstCell(firstcell); row.setFirstCol( findFirstCell(row.getFirstCol()) );
} }
} }
@ -265,13 +267,13 @@ public class HSSFRow
private void addCell(HSSFCell cell) private void addCell(HSSFCell cell)
{ {
if (firstcell == -1) if (row.getFirstCol() == -1)
{ {
firstcell = cell.getCellNum(); row.setFirstCol( cell.getCellNum() );
} }
if (lastcell == -1) if (row.getLastCol() == -1)
{ {
lastcell = cell.getCellNum(); row.setLastCol( cell.getCellNum() );
} }
cells.put(new Integer(cell.getCellNum()), cell); cells.put(new Integer(cell.getCellNum()), cell);
@ -315,7 +317,7 @@ public class HSSFRow
public short getFirstCellNum() public short getFirstCellNum()
{ {
return firstcell; return row.getFirstCol();
} }
/** /**
@ -325,10 +327,7 @@ public class HSSFRow
public short getLastCellNum() public short getLastCellNum()
{ {
return row.getLastCol();
// if (cells.size() == 0) return -1;
// return ((HSSFCell)cells.get(cells.size()-1)).getCellNum();
return lastcell;
} }
/** /**