update LVLF definition

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

src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java

@@ -103,7 +103,7 @@ public class FieldIterator
         else if ( size.equals( "1" ) )
             if ( type.equals( "short" ) )
             {
-                result = "(short) LittleEndian.getUnsignedByte( data, 0x"
+                result = "LittleEndian.getUByte( data, 0x"
                         + Integer.toHexString( offset ) + " + offset )";
             }
             else if ( type.equals( "int" ) || type.equals( "long" ) )

src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java

@@ -16,8 +16,6 @@
 ==================================================================== */
 package org.apache.poi.hwpf.model;
 
-import java.util.Arrays;
-
 import org.apache.poi.hwpf.model.types.LVLFAbstractType;
 import org.apache.poi.util.Internal;
 
@@ -42,55 +40,4 @@ class LVLF extends LVLFAbstractType
         fillFields( std, offset );
     }
 
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        LVLF other = (LVLF) obj;
-        if ( field_10_grfhic != other.field_10_grfhic )
-            return false;
-        if ( field_1_iStartAt != other.field_1_iStartAt )
-            return false;
-        if ( field_2_info2 != other.field_2_info2 )
-            return false;
-        if ( !Arrays.equals( field_3_rgbxchNums, other.field_3_rgbxchNums ) )
-            return false;
-        if ( field_4_ixchFollow != other.field_4_ixchFollow )
-            return false;
-        if ( field_5_dxaIndentSav != other.field_5_dxaIndentSav )
-            return false;
-        if ( field_6_unused2 != other.field_6_unused2 )
-            return false;
-        if ( field_7_cbGrpprlChpx != other.field_7_cbGrpprlChpx )
-            return false;
-        if ( field_8_cbGrpprlPapx != other.field_8_cbGrpprlPapx )
-            return false;
-        if ( field_9_ilvlRestartLim != other.field_9_ilvlRestartLim )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_10_grfhic;
-        result = prime * result + field_1_iStartAt;
-        result = prime * result + field_2_info2;
-        result = prime * result + Arrays.hashCode( field_3_rgbxchNums );
-        result = prime * result + field_4_ixchFollow;
-        result = prime * result + field_5_dxaIndentSav;
-        result = prime * result + field_6_unused2;
-        result = prime * result + field_7_cbGrpprlChpx;
-        result = prime * result + field_8_cbGrpprlPapx;
-        result = prime * result + field_9_ilvlRestartLim;
-        return result;
-    }
-
 }

src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java

@@ -90,7 +90,7 @@ public final class ListLevel
     {
         _lvlf = new LVLF();
         setStartAt( startAt );
-        _lvlf.setNfc( (short) numberFormatCode );
+        _lvlf.setNfc( (byte) numberFormatCode );
         _lvlf.setJc( (byte) alignment );
         _grpprlChpx = numberProperties;
         _grpprlPapx = entryProperties;
@@ -184,7 +184,7 @@ public final class ListLevel
 
     public void setNumberFormat( int numberFormatCode )
     {
-        _lvlf.setNfc( (short) numberFormatCode );
+        _lvlf.setNfc( (byte) numberFormatCode );
     }
 
     public void setNumberProperties( byte[] grpprl )

src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java

@@ -16,6 +16,8 @@
 ==================================================================== */
 package org.apache.poi.hwpf.model.types;
 
+import java.util.Arrays;
+
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
@@ -41,55 +43,57 @@ public abstract class LVLFAbstractType
 {
 
     protected int field_1_iStartAt;
-    protected short field_2_info2;
+    protected byte field_2_nfc;
-    /**/private static final BitField nfc = new BitField(0x00FF);
+    protected byte field_3_info;
-    /**/private static final BitField jc = new BitField(0x0300);
+    /**/private static final BitField jc = new BitField(0x03);
-    /**/private static final BitField fLegal = new BitField(0x0400);
+    /**/private static final BitField fLegal = new BitField(0x04);
-    /**/private static final BitField fNoRestart = new BitField(0x0800);
+    /**/private static final BitField fNoRestart = new BitField(0x08);
-    /**/private static final BitField fIndentSav = new BitField(0x1000);
+    /**/private static final BitField fIndentSav = new BitField(0x10);
-    /**/private static final BitField fConverted = new BitField(0x2000);
+    /**/private static final BitField fConverted = new BitField(0x20);
-    /**/private static final BitField unused1 = new BitField(0x4000);
+    /**/private static final BitField unused1 = new BitField(0x40);
-    /**/private static final BitField fTentative = new BitField(0x8000);
+    /**/private static final BitField fTentative = new BitField(0x80);
-    protected byte[] field_3_rgbxchNums;
+    protected byte[] field_4_rgbxchNums;
-    protected byte field_4_ixchFollow;
+    protected byte field_5_ixchFollow;
-    protected int field_5_dxaIndentSav;
+    protected int field_6_dxaIndentSav;
-    protected int field_6_unused2;
+    protected int field_7_unused2;
-    protected short field_7_cbGrpprlChpx;
+    protected short field_8_cbGrpprlChpx;
-    protected short field_8_cbGrpprlPapx;
+    protected short field_9_cbGrpprlPapx;
-    protected short field_9_ilvlRestartLim;
+    protected short field_10_ilvlRestartLim;
-    protected short field_10_grfhic;
+    protected short field_11_grfhic;
 
     protected LVLFAbstractType()
     {
-        this.field_3_rgbxchNums = new byte[9];
+        this.field_4_rgbxchNums = new byte[9];
     }
 
     protected void fillFields( byte[] data, int offset )
     {
         field_1_iStartAt               = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_info2                  = LittleEndian.getShort( data, 0x4 + offset );
+        field_2_nfc                    = data[ 0x4 + offset ];
-        field_3_rgbxchNums             = LittleEndian.getByteArray( data, 0x6 + offset,9 );
+        field_3_info                   = data[ 0x5 + offset ];
-        field_4_ixchFollow             = data[ 0xf + offset ];
+        field_4_rgbxchNums             = LittleEndian.getByteArray( data, 0x6 + offset,9 );
-        field_5_dxaIndentSav           = LittleEndian.getInt( data, 0x10 + offset );
+        field_5_ixchFollow             = data[ 0xf + offset ];
-        field_6_unused2                = LittleEndian.getInt( data, 0x14 + offset );
+        field_6_dxaIndentSav           = LittleEndian.getInt( data, 0x10 + offset );
-        field_7_cbGrpprlChpx           = (short) LittleEndian.getUnsignedByte( data, 0x18 + offset );
+        field_7_unused2                = LittleEndian.getInt( data, 0x14 + offset );
-        field_8_cbGrpprlPapx           = (short) LittleEndian.getUnsignedByte( data, 0x19 + offset );
+        field_8_cbGrpprlChpx           = LittleEndian.getUByte( data, 0x18 + offset );
-        field_9_ilvlRestartLim         = (short) LittleEndian.getUnsignedByte( data, 0x1a + offset );
+        field_9_cbGrpprlPapx           = LittleEndian.getUByte( data, 0x19 + offset );
-        field_10_grfhic                = (short) LittleEndian.getUnsignedByte( data, 0x1b + offset );
+        field_10_ilvlRestartLim        = LittleEndian.getUByte( data, 0x1a + offset );
+        field_11_grfhic                = LittleEndian.getUByte( data, 0x1b + offset );
     }
 
     public void serialize( byte[] data, int offset )
     {
         LittleEndian.putInt( data, 0x0 + offset, field_1_iStartAt );
-        LittleEndian.putShort( data, 0x4 + offset, field_2_info2 );
+        data[ 0x4 + offset ] = field_2_nfc;
-        System.arraycopy( field_3_rgbxchNums, 0, data, 0x6 + offset, field_3_rgbxchNums.length );
+        data[ 0x5 + offset ] = field_3_info;
-        data[ 0xf + offset ] = field_4_ixchFollow;
+        System.arraycopy( field_4_rgbxchNums, 0, data, 0x6 + offset, field_4_rgbxchNums.length );
-        LittleEndian.putInt( data, 0x10 + offset, field_5_dxaIndentSav );
+        data[ 0xf + offset ] = field_5_ixchFollow;
-        LittleEndian.putInt( data, 0x14 + offset, field_6_unused2 );
+        LittleEndian.putInt( data, 0x10 + offset, field_6_dxaIndentSav );
-        LittleEndian.putUByte( data, 0x18 + offset, field_7_cbGrpprlChpx );
+        LittleEndian.putInt( data, 0x14 + offset, field_7_unused2 );
-        LittleEndian.putUByte( data, 0x19 + offset, field_8_cbGrpprlPapx );
+        LittleEndian.putUByte( data, 0x18 + offset, field_8_cbGrpprlChpx );
-        LittleEndian.putUByte( data, 0x1a + offset, field_9_ilvlRestartLim );
+        LittleEndian.putUByte( data, 0x19 + offset, field_9_cbGrpprlPapx );
-        LittleEndian.putUByte( data, 0x1b + offset, field_10_grfhic );
+        LittleEndian.putUByte( data, 0x1a + offset, field_10_ilvlRestartLim );
+        LittleEndian.putUByte( data, 0x1b + offset, field_11_grfhic );
     }
 
     public byte[] serialize()
@@ -104,7 +108,61 @@ public abstract class LVLFAbstractType
      */
     public static int getSize()
     {
-        return 0 + 4 + 2 + 9 + 1 + 4 + 4 + 1 + 1 + 1 + 1;
+        return 0 + 4 + 1 + 1 + 9 + 1 + 4 + 4 + 1 + 1 + 1 + 1;
+    }
+
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+            return true;
+        if ( obj == null )
+            return false;
+        if ( getClass() != obj.getClass() )
+            return false;
+        LVLFAbstractType other = (LVLFAbstractType) obj;
+        if ( field_1_iStartAt != other.field_1_iStartAt )
+            return false;
+        if ( field_2_nfc != other.field_2_nfc )
+            return false;
+        if ( field_3_info != other.field_3_info )
+            return false;
+        if ( !Arrays.equals( field_4_rgbxchNums, other.field_4_rgbxchNums ) )
+            return false;
+        if ( field_5_ixchFollow != other.field_5_ixchFollow )
+            return false;
+        if ( field_6_dxaIndentSav != other.field_6_dxaIndentSav )
+            return false;
+        if ( field_7_unused2 != other.field_7_unused2 )
+            return false;
+        if ( field_8_cbGrpprlChpx != other.field_8_cbGrpprlChpx )
+            return false;
+        if ( field_9_cbGrpprlPapx != other.field_9_cbGrpprlPapx )
+            return false;
+        if ( field_10_ilvlRestartLim != other.field_10_ilvlRestartLim )
+            return false;
+        if ( field_11_grfhic != other.field_11_grfhic )
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + field_1_iStartAt;
+        result = prime * result + field_2_nfc;
+        result = prime * result + field_3_info;
+        result = prime * result + Arrays.hashCode( field_4_rgbxchNums );
+        result = prime * result + field_5_ixchFollow;
+        result = prime * result + field_6_dxaIndentSav;
+        result = prime * result + field_7_unused2;
+        result = prime * result + field_8_cbGrpprlChpx;
+        result = prime * result + field_9_cbGrpprlPapx;
+        result = prime * result + field_10_ilvlRestartLim;
+        result = prime * result + field_11_grfhic;
+        return result;
     }
 
     public String toString()
@@ -113,9 +171,10 @@ public abstract class LVLFAbstractType
         builder.append("[LVLF]\n");
         builder.append("    .iStartAt             = ");
         builder.append(" (").append(getIStartAt()).append(" )\n");
-        builder.append("    .info2                = ");
+        builder.append("    .nfc                  = ");
-        builder.append(" (").append(getInfo2()).append(" )\n");
+        builder.append(" (").append(getNfc()).append(" )\n");
-        builder.append("         .nfc                      = ").append(getNfc()).append('\n');
+        builder.append("    .info                 = ");
+        builder.append(" (").append(getInfo()).append(" )\n");
         builder.append("         .jc                       = ").append(getJc()).append('\n');
         builder.append("         .fLegal                   = ").append(isFLegal()).append('\n');
         builder.append("         .fNoRestart               = ").append(isFNoRestart()).append('\n');
@@ -145,7 +204,7 @@ public abstract class LVLFAbstractType
     }
 
     /**
-     * Get the iStartAt field for the LVLF record.
+     * A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored.
      */
     @Internal
     public int getIStartAt()
@@ -154,7 +213,7 @@ public abstract class LVLFAbstractType
     }
 
     /**
-     * Set the iStartAt field for the LVLF record.
+     * A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored.
      */
     @Internal
     public void setIStartAt( int field_1_iStartAt )
@@ -163,21 +222,39 @@ public abstract class LVLFAbstractType
     }
 
     /**
-     * Get the info2 field for the LVLF record.
+     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
      */
     @Internal
-    public short getInfo2()
+    public byte getNfc()
     {
-        return field_2_info2;
+        return field_2_nfc;
     }
 
     /**
-     * Set the info2 field for the LVLF record.
+     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
      */
     @Internal
-    public void setInfo2( short field_2_info2 )
+    public void setNfc( byte field_2_nfc )
     {
-        this.field_2_info2 = field_2_info2;
+        this.field_2_nfc = field_2_nfc;
+    }
+
+    /**
+     * Get the info field for the LVLF record.
+     */
+    @Internal
+    public byte getInfo()
+    {
+        return field_3_info;
+    }
+
+    /**
+     * Set the info field for the LVLF record.
+     */
+    @Internal
+    public void setInfo( byte field_3_info )
+    {
+        this.field_3_info = field_3_info;
     }
 
     /**
@@ -186,16 +263,16 @@ public abstract class LVLFAbstractType
     @Internal
     public byte[] getRgbxchNums()
     {
-        return field_3_rgbxchNums;
+        return field_4_rgbxchNums;
     }
 
     /**
      * An array of 8-bit integers. Each integer specifies a one-based character offset to a level placeholder in the xst.rgtchar of the LVL that contains this LVLF. This array is zero-terminated, unless it is full. The count of elements in this array, before to the first terminating zero, MUST be less than or equal to the one-based level of the list to which this LVL corresponds. The integers in this array, before the first terminating zero, MUST be in ascending order, and MUST be unique.
      */
     @Internal
-    public void setRgbxchNums( byte[] field_3_rgbxchNums )
+    public void setRgbxchNums( byte[] field_4_rgbxchNums )
     {
-        this.field_3_rgbxchNums = field_3_rgbxchNums;
+        this.field_4_rgbxchNums = field_4_rgbxchNums;
     }
 
     /**
@@ -204,16 +281,16 @@ public abstract class LVLFAbstractType
     @Internal
     public byte getIxchFollow()
     {
-        return field_4_ixchFollow;
+        return field_5_ixchFollow;
     }
 
     /**
      * An unsigned integer that specifies the character that follows the number text.
      */
     @Internal
-    public void setIxchFollow( byte field_4_ixchFollow )
+    public void setIxchFollow( byte field_5_ixchFollow )
     {
-        this.field_4_ixchFollow = field_4_ixchFollow;
+        this.field_5_ixchFollow = field_5_ixchFollow;
     }
 
     /**
@@ -222,16 +299,16 @@ public abstract class LVLFAbstractType
     @Internal
     public int getDxaIndentSav()
     {
-        return field_5_dxaIndentSav;
+        return field_6_dxaIndentSav;
     }
 
     /**
      * If fIndentSav is nonzero, this is a signed integer that specifies the size, in twips, of the indent that needs to be removed when the numbering is removed. This MUST be less than or equal to 0x00007BC0 or greater than or equal to 0xFFFF8440. If fIndentSav is zero, this MUST be ignored.
      */
     @Internal
-    public void setDxaIndentSav( int field_5_dxaIndentSav )
+    public void setDxaIndentSav( int field_6_dxaIndentSav )
     {
-        this.field_5_dxaIndentSav = field_5_dxaIndentSav;
+        this.field_6_dxaIndentSav = field_6_dxaIndentSav;
     }
 
     /**
@@ -240,16 +317,16 @@ public abstract class LVLFAbstractType
     @Internal
     public int getUnused2()
     {
-        return field_6_unused2;
+        return field_7_unused2;
     }
 
     /**
      * This field MUST be ignored.
      */
     @Internal
-    public void setUnused2( int field_6_unused2 )
+    public void setUnused2( int field_7_unused2 )
     {
-        this.field_6_unused2 = field_6_unused2;
+        this.field_7_unused2 = field_7_unused2;
     }
 
     /**
@@ -258,16 +335,16 @@ public abstract class LVLFAbstractType
     @Internal
     public short getCbGrpprlChpx()
     {
-        return field_7_cbGrpprlChpx;
+        return field_8_cbGrpprlChpx;
     }
 
     /**
      * An unsigned integer that specifies the size, in bytes, of the grpprlChpx in the LVL that contains this LVLF.
      */
     @Internal
-    public void setCbGrpprlChpx( short field_7_cbGrpprlChpx )
+    public void setCbGrpprlChpx( short field_8_cbGrpprlChpx )
     {
-        this.field_7_cbGrpprlChpx = field_7_cbGrpprlChpx;
+        this.field_8_cbGrpprlChpx = field_8_cbGrpprlChpx;
     }
 
     /**
@@ -276,16 +353,16 @@ public abstract class LVLFAbstractType
     @Internal
     public short getCbGrpprlPapx()
     {
-        return field_8_cbGrpprlPapx;
+        return field_9_cbGrpprlPapx;
     }
 
     /**
      * An unsigned integer that specifies the size, in bytes, of the grpprlPapx in the LVL that contains this LVLF.
      */
     @Internal
-    public void setCbGrpprlPapx( short field_8_cbGrpprlPapx )
+    public void setCbGrpprlPapx( short field_9_cbGrpprlPapx )
     {
-        this.field_8_cbGrpprlPapx = field_8_cbGrpprlPapx;
+        this.field_9_cbGrpprlPapx = field_9_cbGrpprlPapx;
     }
 
     /**
@@ -294,16 +371,16 @@ public abstract class LVLFAbstractType
     @Internal
     public short getIlvlRestartLim()
     {
-        return field_9_ilvlRestartLim;
+        return field_10_ilvlRestartLim;
     }
 
     /**
      * An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds. If fNoRestart is zero, this MUST be ignored. If this level does not have a number sequence (see nfc), this MUST be ignored.
      */
     @Internal
-    public void setIlvlRestartLim( short field_9_ilvlRestartLim )
+    public void setIlvlRestartLim( short field_10_ilvlRestartLim )
     {
-        this.field_9_ilvlRestartLim = field_9_ilvlRestartLim;
+        this.field_10_ilvlRestartLim = field_10_ilvlRestartLim;
     }
 
     /**
@@ -312,36 +389,16 @@ public abstract class LVLFAbstractType
     @Internal
     public short getGrfhic()
     {
-        return field_10_grfhic;
+        return field_11_grfhic;
     }
 
     /**
      * A grfhic that specifies the HTML incompatibilities of the level..
      */
     @Internal
-    public void setGrfhic( short field_10_grfhic )
+    public void setGrfhic( short field_11_grfhic )
     {
-        this.field_10_grfhic = field_10_grfhic;
+        this.field_11_grfhic = field_11_grfhic;
-    }
-
-    /**
-     * Sets the nfc field value.
-     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
-     */
-    @Internal
-    public void setNfc( short value )
-    {
-        field_2_info2 = (short)nfc.setValue(field_2_info2, value);
-    }
-
-    /**
-     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
-     * @return  the nfc field value.
-     */
-    @Internal
-    public short getNfc()
-    {
-        return ( short )nfc.getValue(field_2_info2);
     }
 
     /**
@@ -351,7 +408,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setJc( byte value )
     {
-        field_2_info2 = (short)jc.setValue(field_2_info2, value);
+        field_3_info = (byte)jc.setValue(field_3_info, value);
     }
 
     /**
@@ -361,7 +418,7 @@ public abstract class LVLFAbstractType
     @Internal
     public byte getJc()
     {
-        return ( byte )jc.getValue(field_2_info2);
+        return ( byte )jc.getValue(field_3_info);
     }
 
     /**
@@ -371,7 +428,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setFLegal( boolean value )
     {
-        field_2_info2 = (short)fLegal.setBoolean(field_2_info2, value);
+        field_3_info = (byte)fLegal.setBoolean(field_3_info, value);
     }
 
     /**
@@ -381,7 +438,7 @@ public abstract class LVLFAbstractType
     @Internal
     public boolean isFLegal()
     {
-        return fLegal.isSet(field_2_info2);
+        return fLegal.isSet(field_3_info);
     }
 
     /**
@@ -391,7 +448,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setFNoRestart( boolean value )
     {
-        field_2_info2 = (short)fNoRestart.setBoolean(field_2_info2, value);
+        field_3_info = (byte)fNoRestart.setBoolean(field_3_info, value);
     }
 
     /**
@@ -401,7 +458,7 @@ public abstract class LVLFAbstractType
     @Internal
     public boolean isFNoRestart()
     {
-        return fNoRestart.isSet(field_2_info2);
+        return fNoRestart.isSet(field_3_info);
     }
 
     /**
@@ -411,7 +468,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setFIndentSav( boolean value )
     {
-        field_2_info2 = (short)fIndentSav.setBoolean(field_2_info2, value);
+        field_3_info = (byte)fIndentSav.setBoolean(field_3_info, value);
     }
 
     /**
@@ -421,7 +478,7 @@ public abstract class LVLFAbstractType
     @Internal
     public boolean isFIndentSav()
     {
-        return fIndentSav.isSet(field_2_info2);
+        return fIndentSav.isSet(field_3_info);
     }
 
     /**
@@ -431,7 +488,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setFConverted( boolean value )
     {
-        field_2_info2 = (short)fConverted.setBoolean(field_2_info2, value);
+        field_3_info = (byte)fConverted.setBoolean(field_3_info, value);
     }
 
     /**
@@ -441,7 +498,7 @@ public abstract class LVLFAbstractType
     @Internal
     public boolean isFConverted()
     {
-        return fConverted.isSet(field_2_info2);
+        return fConverted.isSet(field_3_info);
     }
 
     /**
@@ -451,17 +508,19 @@ public abstract class LVLFAbstractType
     @Internal
     public void setUnused1( boolean value )
     {
-        field_2_info2 = (short)unused1.setBoolean(field_2_info2, value);
+        field_3_info = (byte)unused1.setBoolean(field_3_info, value);
     }
 
     /**
      * This bit MUST be ignored
      * @return  the unused1 field value.
+     * @deprecated This field should not be used according to specification
      */
     @Internal
+    @Deprecated
     public boolean isUnused1()
     {
-        return unused1.isSet(field_2_info2);
+        return unused1.isSet(field_3_info);
     }
 
     /**
@@ -471,7 +530,7 @@ public abstract class LVLFAbstractType
     @Internal
     public void setFTentative( boolean value )
     {
-        field_2_info2 = (short)fTentative.setBoolean(field_2_info2, value);
+        field_3_info = (byte)fTentative.setBoolean(field_3_info, value);
     }
 
     /**
@@ -481,7 +540,7 @@ public abstract class LVLFAbstractType
     @Internal
     public boolean isFTentative()
     {
-        return fTentative.isSet(field_2_info2);
+        return fTentative.isSet(field_3_info);
     }
 
 }  // END OF CLASS

src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java

@@ -0,0 +1,34 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.hwpf.model.types;
+
+import junit.framework.TestCase;
+
+/**
+ * Test cases for {@link LVLFAbstractType}
+ * 
+ * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
+ */
+public class LVLFAbstractTypeTest extends TestCase
+{
+
+    public void testGetSize()
+    {
+        assertEquals( 28, LVLFAbstractType.getSize() );
+    }
+
+}

src/types/definitions/lvlf_type.xml

@@ -27,22 +27,23 @@
         Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
     </author>
     <fields>
-        <field type="int" size="4" name="iStartAt"/>
+        <field type="int" size="4" name="iStartAt"
-        <field type="short" size="2" name="info2">
+            description="A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored"/>
-            <bit mask="0x00FF" name="nfc"
+        <field type="byte" size="1" name="nfc"
-                description="An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets."/>
+            description="An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets"/>
-            <bit mask="0x0300" name="jc"
+        <field type="byte" size="1" name="info">
+            <bit mask="0x03" name="jc"
                 description="An unsigned integer that specifies the justification of this level"/>
-            <bit mask="0x0400" name="fLegal"
+            <bit mask="0x04" name="fLegal"
                 description="A bit that specifies whether this level overrides the nfc of all inherited level numbers. If the original nfc of a level number is msonfcArabicLZ, it is preserved. Otherwise, the nfc of the level number is overridden by msonfcArabic."/>
-            <bit mask="0x0800" name="fNoRestart"
+            <bit mask="0x08" name="fNoRestart"
                 description="A bit that specifies whether the number sequence of the level does not restart after a level is encountered that is more significant than the level to which this LVLF corresponds"/>
-            <bit mask="0x1000" name="fIndentSav"
+            <bit mask="0x10" name="fIndentSav"
                 description="A bit that specifies whether the level indented the text it was applied to and that the indent needs to be removed when numbering is removed. The indent to be removed is stored in dxaIndentSav"/>
-            <bit mask="0x2000" name="fConverted"
+            <bit mask="0x20" name="fConverted"
                 description="A bit that specifies whether the nfc of this LVLF structure was previously a temporary value used for bidirectional compatibility that was converted into a standard MSONFC"/>
-            <bit mask="0x4000" name="unused1" description="This bit MUST be ignored"/>
+            <bit mask="0x40" name="unused1" deprecated="true" description="This bit MUST be ignored"/>
-            <bit mask="0x8000" name="fTentative"
+            <bit mask="0x80" name="fTentative"
                 description="A bit that specifies whether the format of the level is tentative"/>
         </field>
         <field type="byte[]" size="9" name="rgbxchNums"

src/types/styles/hdftype.xsl

@@ -224,12 +224,24 @@ public abstract class </xsl:text><xsl:call-template name="outputClassName"/><xsl
     <xsl:text>) obj;</xsl:text>
     <xsl:call-template name="linebreak"/>
     <xsl:for-each select="//fields/field">
+        <xsl:variable name="fieldName" select="recutil:getFieldName(position(),@name,0)"/>
         <xsl:call-template name="indent"/>
         <xsl:call-template name="indent"/>
         <xsl:text>if ( </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
+        <xsl:choose>
-        <xsl:text> != other.</xsl:text>
+            <xsl:when test="@type='byte[]'">
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
+                <xsl:text>!Arrays.equals( </xsl:text>
+                <xsl:value-of select="$fieldName"/>
+                <xsl:text>, other.</xsl:text>
+                <xsl:value-of select="$fieldName"/>
+                <xsl:text> )</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$fieldName"/>
+                <xsl:text> != other.</xsl:text>
+                <xsl:value-of select="$fieldName"/>
+            </xsl:otherwise>
+        </xsl:choose>
         <xsl:text> )</xsl:text>
         <xsl:call-template name="linebreak"/>
         <xsl:call-template name="indent"/>
@@ -261,7 +273,16 @@ public abstract class </xsl:text><xsl:call-template name="outputClassName"/><xsl
         <xsl:call-template name="indent"/>
         <xsl:call-template name="indent"/>
         <xsl:text>result = prime * result + </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
+        <xsl:choose>
+            <xsl:when test="@type='byte[]'">
+                <xsl:text>Arrays.hashCode( </xsl:text>
+                <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
+                <xsl:text> )</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
+            </xsl:otherwise>
+        </xsl:choose>
         <xsl:text>;</xsl:text>
         <xsl:call-template name="linebreak"/>
     </xsl:for-each>