dmui 2003/06/27 16:13:30
Modified: src/java/org/apache/poi/hssf/model Sheet.java
Log:
Fixing future bug when we support continue records for more than xxxx merged
regions. Fetch the last merged record as the merged pointer if the current
one is killed.
Revision Changes Path
1.34 +11 -3 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Sheet.java 27 Jun 2003 23:04:28 -0000 1.33
+++ Sheet.java 27 Jun 2003 23:13:29 -0000 1.34
@@ -469,12 +469,20 @@
numMergedRegions--;
if (rec.getNumAreas() == 0)
{
+ mergedRecords.remove(pos);
+ if (merged == rec) {
+ //pull up the LAST record for operations when we finally
+ //support continue records for mergedRegions
+ if (mergedRecords.size() > 0) {
+ merged = (MergeCellsRecord)
mergedRecords.get(mergedRecords.size() - 1);
+ } else {
+ merged = null;
+ }
+ }
- if (merged == rec)
- merged = (MergeCellsRecord) mergedRecords.get(mergedRecords.size() -
1);
int removePos = ((Integer) mergedLocs.get(pos)).intValue();
records.remove(removePos);
- mergedRecords.remove(pos);
+
mergedLocs.remove(pos);
//if we're not tracking merged records, kill the pointer to reset the
state
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
