Return-Path: Delivered-To: apmail-jakarta-poi-dev-archive@www.apache.org Received: (qmail 73694 invoked from network); 5 May 2005 13:07:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2005 13:07:22 -0000 Received: (qmail 29364 invoked by uid 500); 5 May 2005 13:08:39 -0000 Delivered-To: apmail-jakarta-poi-dev-archive@jakarta.apache.org Received: (qmail 29339 invoked by uid 500); 5 May 2005 13:08:39 -0000 Mailing-List: contact poi-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "POI Developers List" Reply-To: "POI Developers List" Delivered-To: mailing list poi-dev@jakarta.apache.org Received: (qmail 29260 invoked by uid 500); 5 May 2005 13:08:38 -0000 Received: (qmail 29231 invoked by uid 99); 5 May 2005 13:08:37 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 05 May 2005 06:08:37 -0700 Received: (qmail 73171 invoked by uid 1445); 5 May 2005 13:06:06 -0000 Date: 5 May 2005 13:06:06 -0000 Message-ID: <20050505130606.73170.qmail@minotaur.apache.org> From: glens@apache.org To: jakarta-poi-cvs@apache.org Subject: cvs commit: jakarta-poi/src/java/org/apache/poi/ddf DefaultEscherRecordFactory.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N glens 2005/05/05 06:06:06 Modified: src/java/org/apache/poi/ddf DefaultEscherRecordFactory.java Log: Patch from Nick. Bug 34744 Fix for ddf.DefaultRecordFactory never creating EscherTextboxRecord Revision Changes Path 1.5 +9 -2 jakarta-poi/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java Index: DefaultEscherRecordFactory.java =================================================================== RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultEscherRecordFactory.java 1 May 2005 11:26:17 -0000 1.4 +++ DefaultEscherRecordFactory.java 5 May 2005 13:06:06 -0000 1.5 @@ -27,6 +27,8 @@ * 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 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() ); --------------------------------------------------------------------- To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org Mailing List: http://jakarta.apache.org/site/mail2.html#poi The Apache Jakarta POI Project: http://jakarta.apache.org/poi/