[patch] much better patch, which handles reads and writes

SheetPatch.txt (text/plain), 5.43 KB, created by Tony Poppleton on 2003-02-10 03:52:22 UTC

(hide)

Description: much better patch, which handles reads and writes

Filename:

MIME Type:

Creator: Tony Poppleton

Created: 2003-02-10 03:52:22 UTC

Size: 5.43 KB

patch

obsolete

>Index: Sheet.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java,v >retrieving revision 1.24 >diff -u -r1.24 Sheet.java >--- Sheet.java 6 Feb 2003 10:29:44 -0000 1.24 >+++ Sheet.java 10 Feb 2003 03:49:54 -0000 >@@ -109,8 +109,10 @@ > protected FooterRecord footer = null; > protected PrintGridlinesRecord printGridlines = null; > protected MergeCellsRecord merged = null; >+ protected ArrayList mergedRecords = new ArrayList(); >+ protected ArrayList mergedLocs = new ArrayList(); >+ protected int numMergedRegions = 0; > protected SelectionRecord selection = null; >- protected int mergedloc = 0; > private static POILogger log = POILogFactory.getLogger(Sheet.class); > private ArrayList columnSizes = null; // holds column info > protected ValueRecordsAggregate cells = null; >@@ -191,8 +193,10 @@ > } > else if (rec.getSid() == MergeCellsRecord.sid) > { >- retval.merged = ( MergeCellsRecord ) rec; >- retval.mergedloc = k - offset; >+ retval.mergedRecords.add(rec); >+ retval.merged = ( MergeCellsRecord ) rec; >+ retval.mergedLocs.add(new Integer(k - offset)); >+ retval.numMergedRegions += retval.merged.getNumAreas(); > } > else if (rec.getSid() == ColumnInfoRecord.sid) > { >@@ -417,36 +421,95 @@ > public int addMergedRegion(int rowFrom, short colFrom, int rowTo, > short colTo) > { >- if (merged == null) >+ if (merged == null || merged.getNumAreas() == 1027) > { >- merged = ( MergeCellsRecord ) createMergedCells(); >- mergedloc = records.size() - 1; >+ merged = ( MergeCellsRecord ) createMergedCells(); >+ mergedRecords.add(merged); >+ mergedLocs.add(new Integer(records.size() - 1)); > records.add(records.size() - 1, merged); > } >- return merged.addArea(rowFrom, colFrom, rowTo, colTo); >+ merged.addArea(rowFrom, colFrom, rowTo, colTo); >+ return numMergedRegions++; > } > > public void removeMergedRegion(int index) > { >- merged.removeAreaAt(index); >- if (merged.getNumAreas() == 0) >+ //safety checks >+ if (index >= numMergedRegions || mergedRecords.size() == 0) >+ return; >+ >+ int pos = 0; >+ int startNumRegions = 0; >+ >+ //optimisation for current record >+ if (numMergedRegions - index < merged.getNumAreas()) > { >- merged = null; >- records.remove(mergedloc); >- mergedloc = 0; >+ pos = mergedRecords.size() - 1; >+ startNumRegions = numMergedRegions - merged.getNumAreas(); >+ } >+ else >+ { >+ for (int n = 0; n < mergedRecords.size(); n++) >+ { >+ MergeCellsRecord record = (MergeCellsRecord) mergedRecords.get(n); >+ if (startNumRegions + record.getNumAreas() > index) >+ { >+ pos = n; >+ break; >+ } >+ startNumRegions += record.getNumAreas(); >+ } >+ } >+ >+ MergeCellsRecord rec = (MergeCellsRecord) mergedRecords.get(pos); >+ rec.removeAreaAt(index - startNumRegions); >+ numMergedRegions--; >+ if (rec.getNumAreas() == 0) >+ { >+ mergedRecords.remove(pos); >+ if (merged == rec) >+ merged = (MergeCellsRecord) mergedRecords.get(mergedRecords.size() - 1); >+ int removePos = ((Integer) mergedLocs.get(pos)).intValue(); >+ records.remove(removePos); >+ mergedLocs.remove(pos); > } > } > > public MergeCellsRecord.MergedRegion getMergedRegionAt(int index) > { >- return merged.getAreaAt(index); >+ //safety checks >+ if (index < numMergedRegions || mergedRecords.size() == 0) >+ return null; >+ >+ int pos = 0; >+ int startNumRegions = 0; >+ >+ //optimisation for current record >+ if (numMergedRegions - index < merged.getNumAreas()) >+ { >+ pos = mergedRecords.size() - 1; >+ startNumRegions = numMergedRegions - merged.getNumAreas(); >+ } >+ else >+ { >+ for (int n = 0; n < mergedRecords.size(); n++) >+ { >+ MergeCellsRecord record = (MergeCellsRecord) mergedRecords.get(n); >+ if (startNumRegions + record.getNumAreas() > index) >+ { >+ pos = n; >+ break; >+ } >+ startNumRegions += record.getNumAreas(); >+ } >+ } >+ return ((MergeCellsRecord) mergedRecords.get(pos)).getAreaAt(index - startNumRegions); > } > > public int getNumMergedRegions() >- { >- return merged!=null ? merged.getNumAreas() : 0; >- } >- >+ { >+ return numMergedRegions; >+ } > > /** > * This is basically a kludge to deal with the now obsolete Label records. If View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]