From 70a07e7973447a6ebc1ff4a5bb222c9d6d9ed7db Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Sun, 13 Jul 2008 14:22:39 +0000
Subject: [PATCH] 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-659571,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)
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@676330 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/changes.xml   |   1 +
 src/documentation/content/xdocs/status.xml    |   1 +
 .../org/apache/poi/hssf/dev/BiffViewer.java   |   2 +
 .../hssf/eventmodel/EventRecordFactory.java   |   3 +-
 .../poi/hssf/record/CFHeaderRecord.java       |   2 +-
 .../poi/hssf/record/HyperlinkRecord.java      |   4 +
 .../apache/poi/hssf/record/RecordFactory.java |   1 +
 .../apache/poi/hssf/record/TableRecord.java   | 248 ++++++++++++++++++
 .../apache/poi/hssf/record/cf/CellRange.java  |   4 +-
 .../apache/poi/hssf/record/formula/Ptg.java   |   1 +
 .../poi/hssf/record/formula/TblPtg.java       |  87 ++++++
 .../org/apache/poi/hssf/data/44958.xls        | Bin 0 -> 31232 bytes
 .../poi/hssf/record/AllRecordTests.java       |   1 +
 .../poi/hssf/record/TestTableRecord.java      | 107 ++++++++
 .../apache/poi/hssf/usermodel/TestBugs.java   |  32 +++
 15 files changed, 490 insertions(+), 4 deletions(-)
 create mode 100644 src/java/org/apache/poi/hssf/record/TableRecord.java
 create mode 100644 src/java/org/apache/poi/hssf/record/formula/TblPtg.java
 create mode 100644 src/testcases/org/apache/poi/hssf/data/44958.xls
 create mode 100644 src/testcases/org/apache/poi/hssf/record/TestTableRecord.java

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index ab7565ea3d..7e1ccbfba5 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -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>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 0c55a1e963..febf5bd1d5 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -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>
diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
index 9396e679de..85b57f089f 100644
--- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
@@ -365,6 +365,8 @@ public final class BiffViewer {
                 return new FileSharingRecord( in );
             case HyperlinkRecord.sid:
                 return new HyperlinkRecord( in );
+            case TableRecord.sid:
+            	return new TableRecord( in );
         }
         return new UnknownRecord( in );
     }
diff --git a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
index 04660c5680..8c4abb76ad 100644
--- a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
+++ b/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
@@ -96,6 +96,7 @@ import org.apache.poi.hssf.record.SharedFormulaRecord;
 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 @@ public class EventRecordFactory
                 TopMarginRecord.class, BottomMarginRecord.class,
                 PaletteRecord.class, StringRecord.class, SharedFormulaRecord.class, 
                 WriteProtectRecord.class, FilePassRecord.class, PaneRecord.class,
-                NoteRecord.class
+                NoteRecord.class, TableRecord.class
             };
        
     }
diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index d74d54ab17..6447546ec6 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
@@ -42,7 +42,7 @@ public final class CFHeaderRecord extends Record
 	{
 		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);
diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index 798d4e1ff5..e28cf5bf86 100644
--- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
@@ -248,6 +248,8 @@ public class HyperlinkRecord extends Record {
      */
     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 class HyperlinkRecord extends Record {
      */
     public String getAddress()
     {
+    	if(address == null) return null;
+    	
         int idx = address.indexOf('\u0000');
         return idx == -1 ? address : address.substring(0, idx);
     }
diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/src/java/org/apache/poi/hssf/record/RecordFactory.java
index 5a627988f2..aaee94991d 100644
--- a/src/java/org/apache/poi/hssf/record/RecordFactory.java
+++ b/src/java/org/apache/poi/hssf/record/RecordFactory.java
@@ -86,6 +86,7 @@ public class RecordFactory
                 CRNRecord.class,
                 CFHeaderRecord.class,
                 CFRuleRecord.class,
+                TableRecord.class
             };
     }
     private static Map           recordsMap  = recordsToMap(records);
diff --git a/src/java/org/apache/poi/hssf/record/TableRecord.java b/src/java/org/apache/poi/hssf/record/TableRecord.java
new file mode 100644
index 0000000000..7a48e5e0e7
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/TableRecord.java
@@ -0,0 +1,248 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
+
+/**
+ * TableRecord - The record specifies a data table.
+ * This record is preceded by a single Formula record that
+ *  defines the first cell in the data table, which should
+ *  only contain a single Ptg, {@link TblPtg}.
+ * 
+ * See p536 of the June 08 binary docs
+ */
+package org.apache.poi.hssf.record;
+
+import org.apache.poi.hssf.record.formula.TblPtg;
+import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.LittleEndian;
+
+public class TableRecord extends Record {
+    public static final short sid = 566;
+    private short field_1_ref_rowFirst;
+    private short field_2_ref_rowLast;
+    private short field_3_ref_colFirst;
+    private short field_4_ref_colLast;
+    
+    private byte field_5_flags;
+    private byte field_6_res;
+    private short field_7_rowInputRow;
+    private short field_8_colInputRow;
+    private short field_9_rowInputCol;
+    private short field_10_colInputCol;
+    
+    private BitField alwaysCalc      = BitFieldFactory.getInstance(0x0001);
+    private BitField reserved1       = BitFieldFactory.getInstance(0x0002);
+    private BitField rowOrColInpCell = BitFieldFactory.getInstance(0x0004);
+    private BitField oneOrTwoVar     = BitFieldFactory.getInstance(0x0008);
+    private BitField rowDeleted      = BitFieldFactory.getInstance(0x0010);
+    private BitField colDeleted      = BitFieldFactory.getInstance(0x0020);
+    private BitField reserved2       = BitFieldFactory.getInstance(0x0040);
+    private BitField reserved3       = BitFieldFactory.getInstance(0x0080);
+
+	protected void fillFields(RecordInputStream in) {
+		field_1_ref_rowFirst = in.readShort();
+		field_2_ref_rowLast  = in.readShort();
+		field_3_ref_colFirst = in.readUByte();
+		field_4_ref_colLast  = in.readUByte();
+		field_5_flags        = in.readByte();
+		field_6_res          = in.readByte();
+		field_7_rowInputRow  = in.readShort();
+		field_8_colInputRow  = in.readShort();
+		field_9_rowInputCol  = in.readShort();
+		field_10_colInputCol = in.readShort();
+	}
+	
+    public TableRecord(RecordInputStream in) {
+        super(in);
+    }
+    public TableRecord() {
+    	super();
+    }
+    
+
+	public short getRowFirst() {
+		return field_1_ref_rowFirst;
+	}
+	public void setRowFirst(short field_1_ref_rowFirst) {
+		this.field_1_ref_rowFirst = field_1_ref_rowFirst;
+	}
+
+	public short getRowLast() {
+		return field_2_ref_rowLast;
+	}
+	public void setRowLast(short field_2_ref_rowLast) {
+		this.field_2_ref_rowLast = field_2_ref_rowLast;
+	}
+
+	public short getColFirst() {
+		return field_3_ref_colFirst;
+	}
+	public void setColFirst(short field_3_ref_colFirst) {
+		this.field_3_ref_colFirst = field_3_ref_colFirst;
+	}
+
+	public short getColLast() {
+		return field_4_ref_colLast;
+	}
+	public void setColLast(short field_4_ref_colLast) {
+		this.field_4_ref_colLast = field_4_ref_colLast;
+	}
+
+	public byte getFlags() {
+		return field_5_flags;
+	}
+	public void setFlags(byte field_5_flags) {
+		this.field_5_flags = field_5_flags;
+	}
+
+	public byte getReserved() {
+		return field_6_res;
+	}
+	public void setReserved(byte field_6_res) {
+		this.field_6_res = field_6_res;
+	}
+
+	public short getRowInputRow() {
+		return field_7_rowInputRow;
+	}
+	public void setRowInputRow(short field_7_rowInputRow) {
+		this.field_7_rowInputRow = field_7_rowInputRow;
+	}
+
+	public short getColInputRow() {
+		return field_8_colInputRow;
+	}
+	public void setColInputRow(short field_8_colInputRow) {
+		this.field_8_colInputRow = field_8_colInputRow;
+	}
+
+	public short getRowInputCol() {
+		return field_9_rowInputCol;
+	}
+	public void setRowInputCol(short field_9_rowInputCol) {
+		this.field_9_rowInputCol = field_9_rowInputCol;
+	}
+
+	public short getColInputCol() {
+		return field_10_colInputCol;
+	}
+	public void setColInputCol(short field_10_colInputCol) {
+		this.field_10_colInputCol = field_10_colInputCol;
+	}
+	
+	
+	public boolean isAlwaysCalc() {
+		return alwaysCalc.isSet(field_5_flags);
+	}
+	public void setAlwaysCalc(boolean flag) {
+		field_5_flags = alwaysCalc.setByteBoolean(field_5_flags, flag);
+	}
+	
+	public boolean isRowOrColInpCell() {
+		return rowOrColInpCell.isSet(field_5_flags);
+	}
+	public void setRowOrColInpCell(boolean flag) {
+		field_5_flags = rowOrColInpCell.setByteBoolean(field_5_flags, flag);
+	}
+	
+	public boolean isOneNotTwoVar() {
+		return oneOrTwoVar.isSet(field_5_flags);
+	}
+	public void setOneNotTwoVar(boolean flag) {
+		field_5_flags = oneOrTwoVar.setByteBoolean(field_5_flags, flag);
+	}
+	
+	public boolean isColDeleted() {
+		return colDeleted.isSet(field_5_flags);
+	}
+	public void setColDeleted(boolean flag) {
+		field_5_flags = colDeleted.setByteBoolean(field_5_flags, flag);
+	}
+	
+	public boolean isRowDeleted() {
+		return rowDeleted.isSet(field_5_flags);
+	}
+	public void setRowDeleted(boolean flag) {
+		field_5_flags = rowDeleted.setByteBoolean(field_5_flags, flag);
+	}
+
+	
+	public short getSid() {
+		return sid;
+	}
+
+	public int serialize(int offset, byte[] data) {
+        LittleEndian.putShort(data, 0 + offset, sid);
+        LittleEndian.putShort(data, 2 + offset, ( short ) (16));
+        
+        LittleEndian.putShort(data, 4 + offset, field_1_ref_rowFirst);
+        LittleEndian.putShort(data, 6 + offset, field_2_ref_rowLast);
+        LittleEndian.putByte(data, 8 + offset, field_3_ref_colFirst);
+        LittleEndian.putByte(data, 9 + offset, field_4_ref_colLast);
+        LittleEndian.putByte(data, 10 + offset, field_5_flags);
+        LittleEndian.putByte(data, 11 + offset, field_6_res);
+        LittleEndian.putShort(data, 12 + offset, field_7_rowInputRow);
+        LittleEndian.putShort(data, 14 + offset, field_8_colInputRow);
+        LittleEndian.putShort(data, 16 + offset, field_9_rowInputCol);
+        LittleEndian.putShort(data, 18 + offset, field_10_colInputCol);
+        
+        return getRecordSize();
+	}
+	public int getRecordSize() {
+		return 4+16;
+	}
+	
+	protected void validateSid(short id) {
+        if (id != sid)
+        {
+            throw new RecordFormatException("NOT A TABLE RECORD");
+        }
+	}
+	
+    public String toString()
+    {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("[TABLE]\n");
+        buffer.append("    .row from      = ")
+             .append(Integer.toHexString(field_1_ref_rowFirst)).append("\n");
+        buffer.append("    .row to        = ")
+            .append(Integer.toHexString(field_2_ref_rowLast)).append("\n");
+        buffer.append("    .column from   = ")
+            .append(Integer.toHexString(field_3_ref_colFirst)).append("\n");
+        buffer.append("    .column to     = ")
+            .append(Integer.toHexString(field_4_ref_colLast)).append("\n");
+        
+        buffer.append("    .flags         = ")
+            .append(Integer.toHexString(field_5_flags)).append("\n");
+        buffer.append("        .always calc     =")
+            .append(isAlwaysCalc()).append("\n");
+        
+        buffer.append("    .reserved      = ")
+            .append(Integer.toHexString(field_6_res)).append("\n");
+        buffer.append("    .row input row = ")
+            .append(Integer.toHexString(field_7_rowInputRow)).append("\n");
+        buffer.append("    .col input row = ")
+            .append(Integer.toHexString(field_8_colInputRow)).append("\n");
+        buffer.append("    .row input col = ")
+            .append(Integer.toHexString(field_9_rowInputCol)).append("\n");
+        buffer.append("    .col input col = ")
+            .append(Integer.toHexString(field_10_colInputCol)).append("\n");
+        buffer.append("[/TABLE]\n");
+        return buffer.toString();
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/record/cf/CellRange.java b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
index f45b79b003..8331fd98f8 100644
--- a/src/java/org/apache/poi/hssf/record/cf/CellRange.java
+++ b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
@@ -78,7 +78,7 @@ public final class CellRange
 		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 @@ public final class CellRange
 	 * @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++)
diff --git a/src/java/org/apache/poi/hssf/record/formula/Ptg.java b/src/java/org/apache/poi/hssf/record/formula/Ptg.java
index 666b83cfa7..69464f8f43 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Ptg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ptg.java
@@ -188,6 +188,7 @@ public abstract class Ptg implements Cloneable {
 		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
diff --git a/src/java/org/apache/poi/hssf/record/formula/TblPtg.java b/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
new file mode 100644
index 0000000000..05d8391b29
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/formula/TblPtg.java
@@ -0,0 +1,87 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.formula;
+
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.hssf.record.RecordFormatException;
+import org.apache.poi.hssf.record.RecordInputStream;
+
+import org.apache.poi.util.LittleEndian;
+
+/**
+ * This ptg indicates a data table.
+ * It only occurs in a FORMULA record, never in an 
+ *  ARRAY or NAME record.  When ptgTbl occurs in a 
+ *  formula, it is the only token in the formula.  
+ * (TODO - check this when processing)
+ * This indicates that the cell containing the 
+ *  formula is an interior cell in a data table; 
+ *  the table description is found in a TABLE
+ *  record. Rows and columns which contain input 
+ *  values to be substituted in the table do 
+ *  not contain ptgTbl.
+ * See page 811 of the june 08 binary docs.
+ */
+public final class TblPtg extends ControlPtg {
+    private final static int  SIZE = 4;
+    public final static short sid  = 0x2;
+    /** The row number of the upper left corner */
+    private final short     field_1_first_row;
+    /** The column number of the upper left corner */
+    private final short     field_2_first_col;
+
+    public TblPtg(RecordInputStream in)
+    {
+      field_1_first_row = in.readShort();
+      field_2_first_col = in.readUByte();
+    }
+    
+    public void writeBytes(byte [] array, int offset)
+    {
+      array[offset+0]= (byte) (sid);
+      LittleEndian.putShort(array,offset+1,field_1_first_row);
+      LittleEndian.putByte(array,offset+3,field_2_first_col);
+    }
+
+    public int getSize()
+    {
+        return SIZE;
+    }
+    
+    public short getRow() {
+      return field_1_first_row;
+    }
+
+    public short getColumn() {
+      return field_2_first_col;
+    }    
+
+    public String toFormulaString(Workbook book)
+    {
+    	// table(....)[][]
+        throw new RecordFormatException("Table and Arrays are not yet supported");
+    }
+    
+    public String toString()
+    {
+        StringBuffer buffer = new StringBuffer("[Data Table - Parent cell is an interior cell in a data table]\n");
+        buffer.append("top left row = ").append(getRow()).append("\n");
+        buffer.append("top left col = ").append(getColumn()).append("\n");
+        return buffer.toString();
+    }    
+}
diff --git a/src/testcases/org/apache/poi/hssf/data/44958.xls b/src/testcases/org/apache/poi/hssf/data/44958.xls
new file mode 100644
index 0000000000000000000000000000000000000000..c16701118de6766cc705eee952224ad0fb6fc43f
GIT binary patch
literal 31232
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

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
index 573f615782..fb3270ae75 100755
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
@@ -101,6 +101,7 @@ public final class AllRecordTests {
 		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);
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
new file mode 100644
index 0000000000..eb17a1ff33
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
@@ -0,0 +1,107 @@
+
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
+package org.apache.poi.hssf.record;
+
+
+import junit.framework.TestCase;
+
+/**
+ * Tests the serialization and deserialization of the TableRecord
+ * class works correctly.  Test data taken directly from a real
+ * Excel file.
+ */
+public class TestTableRecord
+        extends TestCase
+{
+	byte[] header = new byte[] {
+    		0x36, 02, 0x10, 00, // sid=x236, 16 bytes long
+	};
+    byte[] data = new byte[] {
+    		03, 00,  // from row 3 
+    		8, 00,   // to row 8
+    		04,      // from col 4
+    		06,      // to col 6
+    		00, 00,  // no flags set
+    		04, 00,  // row inp row 4
+    		01, 00,  // col inp row 1
+    		0x76, 0x40, // row inp col 0x4076 (!)
+    		00, 00   // col inp col 0
+    };
+
+    public TestTableRecord(String name)
+    {
+        super(name);
+    }
+
+    public void testLoad()
+            throws Exception
+    {
+
+        TableRecord record = new TableRecord(new TestcaseRecordInputStream((short)0x236, (short)data.length, data));
+
+        assertEquals(3, record.getRowFirst());
+        assertEquals(8, record.getRowLast());
+        assertEquals(4, record.getColFirst());
+        assertEquals(6, record.getColLast());
+        assertEquals(0, record.getFlags());
+        assertEquals(4, record.getRowInputRow());
+        assertEquals(1, record.getColInputRow());
+        assertEquals(0x4076, record.getRowInputCol());
+        assertEquals(0, record.getColInputCol());
+
+        assertEquals( 16 + 4, record.getRecordSize() );
+        record.validateSid((short)0x236);
+    }
+
+    public void testStore()
+    {
+//    	Offset 0x3bd9 (15321)
+//    	recordid = 0x236, size = 16
+//    	[TABLE]
+//    	    .row from      = 3
+//    	    .row to        = 8
+//    	    .column from   = 4
+//    	    .column to     = 6
+//    	    .flags         = 0
+//    	        .always calc     =false
+//    	    .reserved      = 0
+//    	    .row input row = 4
+//    	    .col input row = 1
+//    	    .row input col = 4076
+//    	    .col input col = 0
+//    	[/TABLE]
+
+    	TableRecord record = new TableRecord();
+    	record.setRowFirst((short)3);
+    	record.setRowLast((short)8);
+    	record.setColFirst((short)4);
+    	record.setColLast((short)6);
+    	record.setFlags((byte)0);
+    	record.setReserved((byte)0);
+    	record.setRowInputRow((short)4);
+    	record.setColInputRow((short)1);
+    	record.setRowInputCol((short)0x4076);
+    	record.setColInputCol((short)0);
+
+        byte [] recordBytes = record.serialize();
+        assertEquals(recordBytes.length - 4, data.length);
+        for (int i = 0; i < data.length; i++)
+            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+    }
+}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 45671484a9..24d7ccfdad 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -33,6 +33,7 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 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 @@ public final class TestBugs extends TestCase {
     	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
+    }
 }
-- 
2.39.5