You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by gl...@apache.org on 2003/09/21 11:58:24 UTC
cvs commit: jakarta-poi/src/testcases/org/apache/poi/hssf/data blankworkbook.xls
glens 2003/09/21 02:58:24
Modified: src/java/org/apache/poi/hssf/model Tag: REL_2_BRANCH
Sheet.java
Added: src/testcases/org/apache/poi/hssf/data Tag: REL_2_BRANCH
blankworkbook.xls
Log:
Fixed bug relating to rewriting empty workbooks. The aggregates were not being added to the records in this case.
Revision Changes Path
No revision
No revision
1.31.2.8 +14 -15 jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java
Index: Sheet.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java,v
retrieving revision 1.31.2.7
retrieving revision 1.31.2.8
diff -u -r1.31.2.7 -r1.31.2.8
--- Sheet.java 6 Sep 2003 18:56:29 -0000 1.31.2.7
+++ Sheet.java 21 Sep 2003 09:58:24 -0000 1.31.2.8
@@ -235,9 +235,9 @@
}
else if ( rec.getSid() == RowRecord.sid )
{
- RowRecord row = (RowRecord)rec;
- if (!isfirstrow) rec = null; //only add the aggregate once
-
+ RowRecord row = (RowRecord)rec;
+ if (!isfirstrow) rec = null; //only add the aggregate once
+
if ( isfirstrow )
{
retval.rows = new RowRecordsAggregate();
@@ -297,14 +297,16 @@
}
}
retval.records = records;
- if (retval.rows == null)
- {
- retval.rows = new RowRecordsAggregate();
- }
- if (retval.cells == null)
- {
- retval.cells = new ValueRecordsAggregate();
- }
+// if (retval.rows == null)
+// {
+// retval.rows = new RowRecordsAggregate();
+// }
+ retval.checkCells();
+ retval.checkRows();
+// if (retval.cells == null)
+// {
+// retval.cells = new ValueRecordsAggregate();
+// }
log.log(log.DEBUG, "sheet createSheet (existing file) exited");
return retval;
}
@@ -1002,10 +1004,7 @@
{
checkCells();
log.logFormatted(log.DEBUG, "remove value record row,dimsloc %,%",
- new int[]
- {
- row, dimsloc
- });
+ new int[]{row, dimsloc} );
loc = dimsloc;
cells.removeCell(col);
No revision
No revision
1.1.2.1 +11 -0 jakarta-poi/src/testcases/org/apache/poi/hssf/data/Attic/blankworkbook.xls
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org