Author: nick
Date: Sun Jul 13 07:22:39 2008
New Revision: 676330
URL: http://svn.apache.org/viewvc?rev=676330&view=rev
Log:
Merged revisions
638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,
649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-65
9571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676310
via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r676310 | nick | 2008-07-13 13:37:29 +0100 (Sun, 13 Jul 2008) | 1 line
Inspired by bug #44958 - Record level support for Data Tables. (No formula
parser support though)
........
Added:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/TableRecord.java
- copied unchanged from r676310,
poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
- copied, changed from r676310,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/data/44958.xls
- copied unchanged from r676310,
poi/trunk/src/testcases/org/apache/poi/hssf/data/44958.xls
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
- copied unchanged from r676310,
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
Modified:
poi/branches/ooxml/ (props changed)
poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
poi/branches/ooxml/src/documentation/content/xdocs/status.xml
poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/BiffViewer.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecordFactory.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/cf/CellRange.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jul 13 07:22:39 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-676221
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-676310
Modified: poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/changes.xml?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/changes.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/changes.xml Sun Jul 13
07:22:39 2008
@@ -50,6 +50,7 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface
for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.1.1-alpha1" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="add">44958 - Record level
support for Data Tables. (No formula parser support though)</action>
<action dev="POI-DEVELOPERS" type="add">35583 - Include a version
class, org.apache.poi.Version, to allow easy introspection of the POI
version</action>
<action dev="POI-DEVELOPERS" type="add">Allow the cloning of one
HSSFCellStyle onto another, including cloning styles from one HSSFWorkbook onto
another</action>
<action dev="POI-DEVELOPERS" type="fix">45289 - finished support
for special comparison operators in COUNTIF</action>
Modified: poi/branches/ooxml/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/status.xml?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/status.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/status.xml Sun Jul 13
07:22:39 2008
@@ -47,6 +47,7 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface
for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.1.1-alpha1" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="add">44958 - Record level
support for Data Tables. (No formula parser support though)</action>
<action dev="POI-DEVELOPERS" type="add">35583 - Include a version
class, org.apache.poi.Version, to allow easy introspection of the POI
version</action>
<action dev="POI-DEVELOPERS" type="add">Allow the cloning of one
HSSFCellStyle onto another, including cloning styles from one HSSFWorkbook onto
another</action>
<action dev="POI-DEVELOPERS" type="fix">45289 - finished support
for special comparison operators in COUNTIF</action>
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/BiffViewer.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/BiffViewer.java Sun Jul
13 07:22:39 2008
@@ -365,6 +365,8 @@
return new FileSharingRecord( in );
case HyperlinkRecord.sid:
return new HyperlinkRecord( in );
+ case TableRecord.sid:
+ return new TableRecord( in );
}
return new UnknownRecord( in );
}
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
---
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
(original)
+++
poi/branches/ooxml/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
Sun Jul 13 07:22:39 2008
@@ -96,6 +96,7 @@
import org.apache.poi.hssf.record.StringRecord;
import org.apache.poi.hssf.record.StyleRecord;
import org.apache.poi.hssf.record.TabIdRecord;
+import org.apache.poi.hssf.record.TableRecord;
import org.apache.poi.hssf.record.TopMarginRecord;
import org.apache.poi.hssf.record.UnknownRecord;
import org.apache.poi.hssf.record.UseSelFSRecord;
@@ -160,7 +161,7 @@
TopMarginRecord.class, BottomMarginRecord.class,
PaletteRecord.class, StringRecord.class,
SharedFormulaRecord.class,
WriteProtectRecord.class, FilePassRecord.class,
PaneRecord.class,
- NoteRecord.class
+ NoteRecord.class, TableRecord.class
};
}
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
Sun Jul 13 07:22:39 2008
@@ -42,7 +42,7 @@
{
field_4_cell_ranges = EMPTY_CELL_RANGE_ARRAY;
}
- public CFHeaderRecord(Region[] regions)
+ public CFHeaderRecord(org.apache.poi.ss.util.Region[] regions)
{
CellRange[] unmergedRanges =
CellRange.convertRegionsToCellRanges(regions);
CellRange[] mergeCellRanges =
CellRange.mergeCellRanges(unmergedRanges);
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
Sun Jul 13 07:22:39 2008
@@ -248,6 +248,8 @@
*/
public String getLabel()
{
+ if(label == null) return null;
+
int idx = label.indexOf('\u0000');
return idx == -1 ? label : label.substring(0, idx);
}
@@ -269,6 +271,8 @@
*/
public String getAddress()
{
+ if(address == null) return null;
+
int idx = address.indexOf('\u0000');
return idx == -1 ? address : address.substring(0, idx);
}
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecordFactory.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecordFactory.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/RecordFactory.java
Sun Jul 13 07:22:39 2008
@@ -86,6 +86,7 @@
CRNRecord.class,
CFHeaderRecord.class,
CFRuleRecord.class,
+ TableRecord.class
};
}
private static Map recordsMap = recordsToMap(records);
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/cf/CellRange.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/cf/CellRange.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/cf/CellRange.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/cf/CellRange.java
Sun Jul 13 07:22:39 2008
@@ -78,7 +78,7 @@
return _firstColumn == 0 && _lastColumn == LAST_COLUMN_INDEX;
}
- private static CellRange createFromRegion(Region r) {
+ private static CellRange createFromRegion(org.apache.poi.ss.util.Region
r) {
return new CellRange(r.getRowFrom(), r.getRowTo(),
r.getColumnFrom(), r.getColumnTo());
}
@@ -353,7 +353,7 @@
* @param regions
* @return List of CellRange objects
*/
- public static CellRange[] convertRegionsToCellRanges(Region[] regions)
+ public static CellRange[]
convertRegionsToCellRanges(org.apache.poi.ss.util.Region[] regions)
{
CellRange[] result = new CellRange[regions.length];
for( int i=0; i<regions.length; i++)
Modified:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java
(original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java Sun
Jul 13 07:22:39 2008
@@ -188,6 +188,7 @@
switch(id) {
case 0x00: return new UnknownPtg(); //
TODO - not a real Ptg
case ExpPtg.sid: return new ExpPtg(in);
// 0x01
+ case TblPtg.sid: return new TblPtg(in);
// 0x02
case AddPtg.sid: return AddPtg.instance;
// 0x03
case SubtractPtg.sid: return SubtractPtg.instance;
// 0x04
case MultiplyPtg.sid: return MultiplyPtg.instance;
// 0x05
Copied:
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
(from r676310,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/TblPtg.java)
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/TblPtg.java?p2=poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/TblPtg.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/TblPtg.java&r1=676310&r2=676330&rev=676330&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/TblPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
Sun Jul 13 07:22:39 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -71,7 +71,7 @@
return field_2_first_col;
}
- public String toFormulaString(HSSFWorkbook book)
+ public String toFormulaString(Workbook book)
{
// table(....)[][]
throw new RecordFormatException("Table and Arrays are not yet
supported");
Modified:
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
---
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
(original)
+++
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
Sun Jul 13 07:22:39 2008
@@ -101,6 +101,7 @@
result.addTestSuite(TestStringRecord.class);
result.addTestSuite(TestSubRecord.class);
result.addTestSuite(TestSupBookRecord.class);
+ result.addTestSuite(TestTableRecord.class);
result.addTestSuite(TestTextObjectBaseRecord.class);
result.addTestSuite(TestTextObjectRecord.class);
result.addTestSuite(TestTextRecord.class);
Modified:
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=676330&r1=676329&r2=676330&view=diff
==============================================================================
---
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Sun Jul 13 07:22:39 2008
@@ -33,6 +33,7 @@
import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.CellValueRecordInterface;
import org.apache.poi.hssf.record.EmbeddedObjectRefSubRecord;
+import org.apache.poi.hssf.record.FormulaRecord;
import org.apache.poi.hssf.record.NameRecord;
import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
@@ -1322,4 +1323,35 @@
assertEquals(5, r.getLastCellNum()); // last cell # + 1
assertEquals(3, r.getPhysicalNumberOfCells());
}
+
+ /**
+ * Data Tables - ptg 0x2
+ */
+ public void test44958() throws Exception {
+ HSSFWorkbook wb = openSample("44958.xls");
+ HSSFSheet s;
+ HSSFRow r;
+ HSSFCell c;
+
+ // Check the contents of the formulas
+
+ // E4 to G9 of sheet 4 make up the table
+ s = wb.getSheet("OneVariable Table Completed");
+ r = s.getRow(3);
+ c = r.getCell(4);
+ assertEquals(HSSFCell.CELL_TYPE_FORMULA, c.getCellType());
+
+ // TODO - check the formula once tables and
+ // arrays are properly supported
+
+
+ // E4 to H9 of sheet 5 make up the table
+ s = wb.getSheet("TwoVariable Table Example");
+ r = s.getRow(3);
+ c = r.getCell(4);
+ assertEquals(HSSFCell.CELL_TYPE_FORMULA, c.getCellType());
+
+ // TODO - check the formula once tables and
+ // arrays are properly supported
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
