more correct definition of FLD, preserving reserved bits

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144249 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
index b99a0edc3405336888b66c1d9169fc6fa8d40bca..d24fea09560904d3bcb2b936e3fb2a78aebf70e9 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
@@ -35,7 +35,9 @@ import org.apache.poi.util.BitField;
 public abstract class FLDAbstractType implements HDFType
 {
 
-    protected char field_1_ch;
+    protected byte field_1_chHolder;
+    private static BitField ch = new BitField( 0x1f );
+    private static BitField reserved = new BitField( 0xe0 );
     protected byte field_2_flt;
     private static BitField fDiffer = new BitField( 0x01 );
     private static BitField fZombieEmbed = new BitField( 0x02 );
@@ -53,18 +55,14 @@ public abstract class FLDAbstractType implements HDFType
 
     protected void fillFields( byte[] data, int offset )
     {
-        field_1_ch = (char) data[0x0 + offset];
+        field_1_chHolder = data[0x0 + offset];
         field_2_flt = data[0x1 + offset];
-
     }
 
     public void serialize( byte[] data, int offset )
     {
-        data[0x0 + offset] = (byte) field_1_ch;
-        ;
+        data[0x0 + offset] = field_1_chHolder;
         data[0x1 + offset] = field_2_flt;
-        ;
-
     }
 
     public String toString()
@@ -73,8 +71,12 @@ public abstract class FLDAbstractType implements HDFType
 
         buffer.append( "[FLD]\n" );
 
-        buffer.append( "    .ch                   = " );
-        buffer.append( " (" ).append( getCh() ).append( " )\n" );
+        buffer.append( "    .chHolder             = " );
+        buffer.append( " (" ).append( getChHolder() ).append( " )\n" );
+        buffer.append( "         .ch                       = " )
+                .append( getCh() ).append( '\n' );
+        buffer.append( "         .reserved                 = " )
+                .append( getReserved() ).append( '\n' );
 
         buffer.append( "    .flt                  = " );
         buffer.append( " (" ).append( getFlt() ).append( " )\n" );
@@ -108,21 +110,19 @@ public abstract class FLDAbstractType implements HDFType
     }
 
     /**
-     * Type of field boundary the FLD describes: 19 -- field begin mark, 20 --
-     * field separation mark; 21 -- field end mark.
+     * ch field holder (along with reserved bits).
      */
-    public char getCh()
+    public byte getChHolder()
     {
-        return field_1_ch;
+        return field_1_chHolder;
     }
 
     /**
-     * Type of field boundary the FLD describes: 19 -- field begin mark, 20 --
-     * field separation mark; 21 -- field end mark.
+     * ch field holder (along with reserved bits).
      */
-    public void setCh( char field_1_ch )
+    public void setChHolder( byte field_1_chHolder )
     {
-        this.field_1_ch = field_1_ch;
+        this.field_1_chHolder = field_1_chHolder;
     }
 
     /**
@@ -141,6 +141,48 @@ public abstract class FLDAbstractType implements HDFType
         this.field_2_flt = field_2_flt;
     }
 
+    /**
+     * Sets the ch field value. Type of field boundary the FLD describes: 19 --
+     * field begin mark, 20 -- field separation mark; 21 -- field end mark
+     */
+    public void setCh( byte value )
+    {
+        field_1_chHolder = (byte) ch.setValue( field_1_chHolder, value );
+
+    }
+
+    /**
+     * Type of field boundary the FLD describes: 19 -- field begin mark, 20 --
+     * field separation mark; 21 -- field end mark
+     * 
+     * @return the ch field value.
+     */
+    public byte getCh()
+    {
+        return (byte) ch.getValue( field_1_chHolder );
+
+    }
+
+    /**
+     * Sets the reserved field value. Reserved
+     */
+    public void setReserved( byte value )
+    {
+        field_1_chHolder = (byte) reserved.setValue( field_1_chHolder, value );
+
+    }
+
+    /**
+     * Reserved
+     * 
+     * @return the reserved field value.
+     */
+    public byte getReserved()
+    {
+        return (byte) reserved.getValue( field_1_chHolder );
+
+    }
+
     /**
      * Sets the fDiffer field value. Ignored for saved file
      */
@@ -305,6 +347,5 @@ public abstract class FLDAbstractType implements HDFType
         return fHasSep.isSet( field_2_flt );
 
     }
-
 } // END OF CLASS
 

diff --git a/src/types/definitions/fld_type.xml b/src/types/definitions/fld_type.xml
index 4ca480c995dc748434c2dbfd114222da0798ae18..2c7a0b945d2b28af2529f4a8c188fd058fb11dfb 100644 (file)
--- a/src/types/definitions/fld_type.xml
+++ b/src/types/definitions/fld_type.xml
@@ -28,8 +28,11 @@
         Specification [*.doc]
     </author>
     <fields>
-        <field type="char" size="1" name="ch"
-            description="Type of field boundary the FLD describes: 19 -- field begin mark, 20 -- field separation mark; 21 -- field end mark"/>
+        <field type="byte" size="1" name="chHolder" description="ch field holder (along with reserved bits)">
+            <bit number="0" mask="0x1f" name="ch"
+                description="Type of field boundary the FLD describes: 19 -- field begin mark, 20 -- field separation mark; 21 -- field end mark"/>
+            <bit number="0" mask="0xe0" name="reserved" description="Reserved"/>
+        </field>
         <field type="byte" size="1" name="flt"
             description="Field type when ch == 19 OR field flags when ch == 21 ">
             <bit number="0" mask="0x01" name="fDiffer" description="Ignored for saved file"/>