glens 2004/02/10 13:58:00
Modified: src/java/org/apache/poi/hssf/record Tag: REL_2_BRANCH
RecordFactory.java UnknownRecord.java
Added: src/java/org/apache/poi/hssf/record Tag: REL_2_BRANCH
AbstractEscherHolderRecord.java
CommonObjectDataSubRecord.java
DrawingGroupRecord.java DrawingRecord.java
DrawingRecordForBiffViewer.java
DrawingSelectionRecord.java EndSubRecord.java
EscherAggregate.java GroupMarkerSubRecord.java
ObjRecord.java SubRecord.java
TextObjectBaseRecord.java TextObjectRecord.java
Log:
Escher records for drawing format support
Revision Changes Path
No revision
No revision
1.16.2.2 +9 -6
jakarta-poi/src/java/org/apache/poi/hssf/record/RecordFactory.java
Index: RecordFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/RecordFactory.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- RecordFactory.java 9 Feb 2004 22:41:26 -0000 1.16.2.1
+++ RecordFactory.java 10 Feb 2004 21:58:00 -0000 1.16.2.2
@@ -55,14 +55,12 @@
package org.apache.poi.hssf.record;
-import java.io.InputStream;
-import java.io.IOException;
-
-import java.util.*;
+import org.apache.poi.util.LittleEndian;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
-
-import org.apache.poi.util.LittleEndian;
+import java.util.*;
/**
* Title: Record Factory<P>
@@ -112,6 +110,8 @@
FormulaRecord.class, BoolErrRecord.class, ExternSheetRecord.class,
NameRecord.class, LeftMarginRecord.class, RightMarginRecord.class,
TopMarginRecord.class, BottomMarginRecord.class,
+ DrawingRecord.class, DrawingGroupRecord.class,
DrawingSelectionRecord.class,
+ ObjRecord.class, TextObjectRecord.class,
PaletteRecord.class, StringRecord.class, RecalcIdRecord.class,
SharedFormulaRecord.class,
HorizontalPageBreakRecord.class, VerticalPageBreakRecord.class
};
@@ -145,6 +145,8 @@
LeftMarginRecord.class, RightMarginRecord.class,
TopMarginRecord.class, BottomMarginRecord.class,
PaletteRecord.class, StringRecord.class, RecalcIdRecord.class,
SharedFormulaRecord.class,
+ DrawingRecord.class, DrawingGroupRecord.class,
DrawingSelectionRecord.class,
+ ObjRecord.class, TextObjectRecord.class,
HorizontalPageBreakRecord.class, VerticalPageBreakRecord.class
};
@@ -362,6 +364,7 @@
}
catch (Exception illegalArgumentException)
{
+ illegalArgumentException.printStackTrace();
throw new RecordFormatException(
"Unable to determine record types");
}
1.6.2.2 +8 -3
jakarta-poi/src/java/org/apache/poi/hssf/record/UnknownRecord.java
Index: UnknownRecord.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/UnknownRecord.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- UnknownRecord.java 28 Jun 2003 05:52:14 -0000 1.6.2.1
+++ UnknownRecord.java 10 Feb 2004 21:58:00 -0000 1.6.2.2
@@ -1,4 +1,3 @@
-
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -92,10 +91,16 @@
thedata = data;
}
+ public UnknownRecord( short id, short size, byte[] data, int offset )
+ {
+ sid = id;
+ thedata = new byte[size];
+ System.arraycopy(data, offset, thedata, 0, size);
+ }
+
/**
- * spit the record out AS IS. no interperatation or identification
+ * spit the record out AS IS. no interpretation or identification
*/
-
public int serialize(int offset, byte [] data)
{
if (thedata == null)
No revision
Index: UnknownRecord.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/UnknownRecord.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- UnknownRecord.java 28 Jun 2003 05:52:14 -0000 1.6.2.1
+++ UnknownRecord.java 10 Feb 2004 21:58:00 -0000 1.6.2.2
@@ -1,4 +1,3 @@
-
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -92,10 +91,16 @@
thedata = data;
}
+ public UnknownRecord( short id, short size, byte[] data, int offset )
+ {
+ sid = id;
+ thedata = new byte[size];
+ System.arraycopy(data, offset, thedata, 0, size);
+ }
+
/**
- * spit the record out AS IS. no interperatation or identification
+ * spit the record out AS IS. no interpretation or identification
*/
-
public int serialize(int offset, byte [] data)
{
if (thedata == null)
No revision
Index: UnknownRecord.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/UnknownRecord.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- UnknownRecord.java 28 Jun 2003 05:52:14 -0000 1.6.2.1
+++ UnknownRecord.java 10 Feb 2004 21:58:00 -0000 1.6.2.2
@@ -1,4 +1,3 @@
-
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -92,10 +91,16 @@
thedata = data;
}
+ public UnknownRecord( short id, short size, byte[] data, int offset )
+ {
+ sid = id;
+ thedata = new byte[size];
+ System.arraycopy(data, offset, thedata, 0, size);
+ }
+
/**
- * spit the record out AS IS. no interperatation or identification
+ * spit the record out AS IS. no interpretation or identification
*/
-
public int serialize(int offset, byte [] data)
{
if (thedata == null)
1.1.2.1 +266 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/AbstractEscherHolderRecord.java
1.1.2.1 +498 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/CommonObjectDataSubRecord.java
1.1.2.1 +30 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/DrawingGroupRecord.java
1.1.2.1 +97 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/DrawingRecord.java
1.1.2.1 +35 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/DrawingRecordForBiffViewer.java
1.1.2.1 +30 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/DrawingSelectionRecord.java
1.1.2.1 +176 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/EndSubRecord.java
1.1.2.1 +696 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/EscherAggregate.java
1.1.2.1 +176 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/GroupMarkerSubRecord.java
1.1.2.1 +227 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/ObjRecord.java
1.1.2.1 +98 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/SubRecord.java
1.1.2.1 +519 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/TextObjectBaseRecord.java
1.1.2.1 +216 -0
jakarta-poi/src/java/org/apache/poi/hssf/record/Attic/TextObjectRecord.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
