Author: nick
Date: Sun Feb 26 12:52:42 2006
New Revision: 381167
URL: http://svn.apache.org/viewcvs?rev=381167&view=rev
Log:
Finish Comment2000Atom support
Modified:
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
Modified:
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java?rev=381167&r1=381166&r2=381167&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
Sun Feb 26 12:52:42 2006
@@ -16,12 +16,12 @@
private CString authorRecord;
private CString authorInitialsRecord;
private CString commentRecord;
- //private Comment2000Atom commentAtom;
+ private Comment2000Atom commentAtom;
/**
* Returns the Comment2000Atom of this Comment
*/
- //public Comment2000Atom getComment2000Atom() { return commentAtom; }
+ public Comment2000Atom getComment2000Atom() { return commentAtom; }
/**
* Get the Author of this comment
@@ -92,6 +92,11 @@
throw new IllegalStateException("Third child record
wasn't a CString, was of type " + _children[2].getRecordType());
}
// Fourth child should be the comment atom
+ if(_children[3] instanceof Comment2000Atom) {
+ commentAtom = (Comment2000Atom)_children[3];
+ } else {
+ throw new IllegalStateException("Fourth child record
wasn't a Comment2000Atom, was of type " + _children[3].getRecordType());
+ }
}
/**
Modified:
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java?rev=381167&r1=381166&r2=381167&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
Sun Feb 26 12:52:42 2006
@@ -46,8 +46,8 @@
* Constructs a brand new comment atom record.
*/
protected Comment2000Atom() {
- _header = new byte[28];
- _data = new byte[8];
+ _header = new byte[8];
+ _data = new byte[28];
LittleEndian.putShort(_header, 2, (short)getRecordType());
LittleEndian.putInt(_header, 4, _data.length);
Modified:
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java?rev=381167&r1=381166&r2=381167&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
Sun Feb 26 12:52:42 2006
@@ -152,8 +152,8 @@
// Records ~12000 seem to be related to the Comments used in PPT 2000/XP
// (Comments in PPT97 are normal Escher text boxes)
- public static final Type Comment2000 = new
Type(12000,org.apache.poi.hslf.record.Comment2000.class);
- public static final Type Comment2000Atom = new Type(12002,null);
+ public static final Type Comment2000 = new Type(12000,Comment2000.class);
+ public static final Type Comment2000Atom = new
Type(12001,Comment2000Atom.class);
public static final Type Comment2000Summary = new Type(12004,null);
public static final Type Comment2000SummaryAtom = new Type(12005,null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
