diff options
| -rw-r--r-- | src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java index 1aa9c6ee7f..55cc3078c3 100644 --- a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java +++ b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java @@ -27,6 +27,8 @@ import java.util.Map; * Generates escher records when provided the byte array containing those records. * * @author Glen Stampoultzis + * @author Nick Burch (nick at torchbox . com) + * * @see EscherRecordFactory */ public class DefaultEscherRecordFactory @@ -57,8 +59,13 @@ public class DefaultEscherRecordFactory public EscherRecord createRecord( byte[] data, int offset ) { EscherRecord.EscherRecordHeader header = EscherRecord.EscherRecordHeader.readHeader( data, offset ); - if ( ( header.getOptions() & (short) 0x000F ) == (short) 0x000F ) - { + + // Options of 0x000F means container record + // However, EscherTextboxRecord are containers of records for the + // host application, not of other Escher records, so treat them + // differently + if ( ( header.getOptions() & (short) 0x000F ) == (short) 0x000F + && header.getRecordId() != EscherTextboxRecord.RECORD_ID ) { EscherContainerRecord r = new EscherContainerRecord(); r.setRecordId( header.getRecordId() ); r.setOptions( header.getOptions() ); |