git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353672 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Glen Stampoultzis 2005-05-05 13:07:58 +00:00
parent 2e3142e65c
commit e88d77492c

View File

@ -748,7 +748,6 @@ public class Sheet implements Model
{ {
Record record = (( Record ) records.get(k)); Record record = (( Record ) records.get(k));
int startPos = pos;
//Once the rows have been found in the list of records, start //Once the rows have been found in the list of records, start
//writing out the blocked row information. This includes the DBCell references //writing out the blocked row information. This includes the DBCell references
if (record instanceof RowRecordsAggregate) { if (record instanceof RowRecordsAggregate) {
@ -762,7 +761,7 @@ public class Sheet implements Model
if (record.getSid() == BOFRecord.sid) { if (record.getSid() == BOFRecord.sid) {
//Can there be more than one BOF for a sheet? If not then we can //Can there be more than one BOF for a sheet? If not then we can
//remove this guard. So be safe it is left here. //remove this guard. So be safe it is left here.
if ((rows != null) && (!haveSerializedIndex)) { if (rows != null && !haveSerializedIndex) {
haveSerializedIndex = true; haveSerializedIndex = true;
pos += serializeIndexRecord(k, pos, data); pos += serializeIndexRecord(k, pos, data);
} }
@ -2049,20 +2048,19 @@ public class Sheet implements Model
} }
//Add space for the IndexRecord //Add space for the IndexRecord
if (rows != null) { if (rows != null) {
final int blocks = rows.getRowBlockCount(); final int blocks = rows.getRowBlockCount();
retval += IndexRecord.getRecordSizeForBlockCount(blocks); retval += IndexRecord.getRecordSizeForBlockCount(blocks);
//Add space for the DBCell records //Add space for the DBCell records
//Once DBCell per block. //Once DBCell per block.
//8 bytes per DBCell (non variable section) //8 bytes per DBCell (non variable section)
//2 bytes per row reference //2 bytes per row reference
int startRetVal = retval; retval += (8 * blocks);
retval += (8 * blocks); for (Iterator itr = rows.getIterator(); itr.hasNext();) {
for (Iterator itr = rows.getIterator(); itr.hasNext();) { RowRecord row = (RowRecord)itr.next();
RowRecord row = (RowRecord)itr.next(); if (cells != null && cells.rowHasCells(row.getRowNumber()))
if (cells.rowHasCells(row.getRowNumber())) retval += 2;
retval += 2; }
}
} }
return retval; return retval;
} }