Removed HDF API

Sonar fixes

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

99 files changed, 401 insertions, 25520 deletions

diff --git a/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java b/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
index 4e8219b260..1d8c95a19f 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
@@ -19,6 +19,7 @@ package org.apache.poi.hslf.examples;
 
 import java.awt.Rectangle;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 import org.apache.poi.hslf.usermodel.HSLFHyperlink;
 import org.apache.poi.hslf.usermodel.HSLFSlide;
@@ -27,17 +28,14 @@ import org.apache.poi.hslf.usermodel.HSLFTextBox;
 
 /**
  * Demonstrates how to create hyperlinks in PowerPoint presentations
- *
- * @author Yegor Kozlov
  */
-public final class CreateHyperlink {
-
-    @SuppressWarnings("unused")
-    public static void main(String[] args) throws Exception {
+public abstract class CreateHyperlink {
+    
+    public static void main(String[] args) throws IOException {
         HSLFSlideShow ppt = new HSLFSlideShow();
 
         HSLFSlide slideA = ppt.createSlide();
-        HSLFSlide slideB = ppt.createSlide();
+        ppt.createSlide();
         HSLFSlide slideC = ppt.createSlide();
 
         // link to a URL
diff --git a/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java b/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
index 93b78ce81d..b37aed2df6 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
@@ -17,18 +17,16 @@
 package org.apache.poi.hslf.examples;
 
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
 import org.apache.poi.hslf.usermodel.HSLFSlideShow;
 
 /**
  * Demonstrates how to set headers / footers
- *
- * @author Yegor Kozlov
  */
-public class HeadersFootersDemo {
-    public static void main(String[] args) throws Exception {
+public abstract class HeadersFootersDemo {
+    public static void main(String[] args) throws IOException {
         HSLFSlideShow ppt = new HSLFSlideShow();
         
         HeadersFooters slideHeaders = ppt.getSlideHeadersFooters();
@@ -40,7 +38,7 @@ public class HeadersFootersDemo {
         notesHeaders.setFootersText("My notes footers");
         notesHeaders.setHeaderText("My notes header");
 
-        HSLFSlide slide = ppt.createSlide();
+        ppt.createSlide();
 
         FileOutputStream out = new FileOutputStream("headers_footers.ppt");
         ppt.write(out);
diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java
index 14575aa007..cf37752000 100644
--- a/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java
+++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java
@@ -158,7 +158,7 @@ public class BigExample {
 
         // demonstrate adding/naming and deleting a sheet
         // create a sheet, set its title then delete it
-        s = wb.createSheet();
+        wb.createSheet();
         wb.setSheetName(1, "DeletedSheet");
         wb.removeSheetAt(1);
         //end deleted sheet
@@ -167,5 +167,6 @@ public class BigExample {
         // close our file (don't blow out our file handles
         wb.write(out);
         out.close();
+        wb.close();
     }
 }
diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java
index cc8ed41307..9294b5babc 100644
--- a/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java
+++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java
@@ -38,9 +38,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
  * THIS IS NOT THE MAIN HSSF FILE!! This is a utility for testing functionality.
  * It does contain sample API usage that may be educational to regular API
  * users.
- *
- * @see #main
- * @author Andrew Oliver (acoliver at apache dot org)
  */
 public final class HSSFReadWrite {
 
@@ -48,7 +45,12 @@ public final class HSSFReadWrite {
 	 * creates an {@link HSSFWorkbook} the specified OS filename.
 	 */
 	private static HSSFWorkbook readFile(String filename) throws IOException {
-		return new HSSFWorkbook(new FileInputStream(filename));
+	    FileInputStream fis = new FileInputStream(filename);
+	    try {
+	        return new HSSFWorkbook(fis);
+	    } finally {
+	        fis.close();
+	    }
 	}
 
 	/**
@@ -115,7 +117,7 @@ public final class HSSFReadWrite {
 
 		// end draw thick black border
 		// create a sheet, set its title then delete it
-		s = wb.createSheet();
+		wb.createSheet();
 		wb.setSheetName(1, "DeletedSheet");
 		wb.removeSheetAt(1);
 
@@ -123,6 +125,8 @@ public final class HSSFReadWrite {
 		FileOutputStream out = new FileOutputStream(outputFilename);
 		wb.write(out);
 		out.close();
+		
+		wb.close();
 	}
 
 	/**
@@ -198,6 +202,7 @@ public final class HSSFReadWrite {
 						}
 					}
 				}
+				wb.close();
 			} else if (args.length == 2) {
 				if (args[1].toLowerCase(Locale.ROOT).equals("write")) {
 					System.out.println("Write mode");
@@ -213,6 +218,7 @@ public final class HSSFReadWrite {
 
 					wb.write(stream);
 					stream.close();
+					wb.close();
 				}
 			} else if (args.length == 3 && args[2].toLowerCase(Locale.ROOT).equals("modify1")) {
 				// delete row 0-24, row 74 - 99 && change cell 3 on row 39 to string "MODIFIED CELL!!"
@@ -237,6 +243,7 @@ public final class HSSFReadWrite {
 
 				wb.write(stream);
 				stream.close();
+				wb.close();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
index 40754feec4..495543e49a 100644
--- a/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
+++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
@@ -17,27 +17,27 @@
 
 package org.apache.poi.hssf.usermodel.examples;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.ss.util.WorkbookUtil;
 
-import java.io.IOException;
-import java.io.FileOutputStream;
-
 /**
  * Creates a new workbook with a sheet that's been explicitly defined.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
-public class NewSheet {
+public abstract class NewSheet {
     public static void main(String[] args) throws IOException {
         HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        HSSFSheet sheet2 = wb.createSheet(); // create with default name
+        wb.createSheet("new sheet");
+        // create with default name
+        wb.createSheet();
         final String name = "second sheet";
-        wb.setSheetName(1, WorkbookUtil.createSafeSheetName(name)); // setting sheet name later
+        // setting sheet name later
+        wb.setSheetName(1, WorkbookUtil.createSafeSheetName(name));
         FileOutputStream fileOut = new FileOutputStream("workbook.xls");
         wb.write(fileOut);
         fileOut.close();
+        wb.close();
     }
 }
diff --git a/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java b/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
index 7a7d459947..3358406858 100644
--- a/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
+++ b/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
@@ -21,35 +21,37 @@ package org.apache.poi.xslf.usermodel;
 

 import java.awt.Dimension;

 import java.io.FileInputStream;

+import java.io.IOException;

 import java.io.InputStream;

-import java.util.List;

+import java.io.PrintStream;

 

+import org.apache.poi.openxml4j.exceptions.OpenXML4JException;

 import org.apache.poi.openxml4j.opc.PackagePart;

 

 /**

  * Demonstrates how you can extract data from a .pptx file

- *

- * @author Yegor Kozlov

  */

 public final class DataExtraction {

 

-    @SuppressWarnings("unused")

-    public static void main(String args[]) throws Exception {

+    public static void main(String args[]) throws IOException, OpenXML4JException {

+

+        PrintStream out = System.out;

 

         if (args.length == 0) {

-           System.out.println("Input file is required");

+           out.println("Input file is required");

            return;

         }

-

+        

         FileInputStream is = new FileInputStream(args[0]);

         XMLSlideShow ppt = new XMLSlideShow(is);

         is.close();

 

         // Get the document's embedded files.

-        List<PackagePart> embeds = ppt.getAllEmbedds();

-        for (PackagePart p : embeds) {

+        for (PackagePart p : ppt.getAllEmbedds()) {

             String type = p.getContentType();

-            String name = p.getPartName().getName();  //typically file name

+            // typically file name

+            String name = p.getPartName().getName();  

+            out.println("Embedded file ("+type+"): "+name);

             

             InputStream pIs = p.getInputStream();

             // make sense of the part data

@@ -58,33 +60,31 @@ public final class DataExtraction {
         }

 

         // Get the document's embedded files.

-        List<XSLFPictureData> images = ppt.getPictureData();

-        for (XSLFPictureData data : images) {

-            PackagePart p = data.getPackagePart();

-

-            String type = p.getContentType();

+        for (XSLFPictureData data : ppt.getPictureData()) {

+            String type = data.getContentType();

             String name = data.getFileName();

+            out.println("Picture ("+type+"): "+name);

 

-            InputStream pIs = p.getInputStream();

+            InputStream pIs = data.getInputStream();

             // make sense of the image data

             pIs.close();

-

-

-

         }

 

-        Dimension pageSize = ppt.getPageSize();  // size of the canvas in points

+        // size of the canvas in points

+        Dimension pageSize = ppt.getPageSize();

+        out.println("Pagesize: "+pageSize);

+        

         for(XSLFSlide slide : ppt.getSlides()) {

             for(XSLFShape shape : slide){

                 if(shape instanceof XSLFTextShape) {

                     XSLFTextShape txShape = (XSLFTextShape)shape;

-                    System.out.println(txShape.getText());

+                    out.println(txShape.getText());

                 } else if (shape instanceof XSLFPictureShape){

                     XSLFPictureShape pShape = (XSLFPictureShape)shape;

                     XSLFPictureData pData = pShape.getPictureData();

-                    System.out.println(pData.getFileName());

+                    out.println(pData.getFileName());

                 } else {

-                    System.out.println("Process me: " + shape.getClass());

+                    out.println("Process me: " + shape.getClass());

                 }

             }

         }

diff --git a/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java b/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
index 41d4b132b0..23779d3059 100644
--- a/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
+++ b/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
@@ -170,32 +170,30 @@ public class XLSX2CSV {
                 this.formatString = null;
                 String cellType = attributes.getValue("t");
                 String cellStyleStr = attributes.getValue("s");
-                if ("b".equals(cellType))
+                if ("b".equals(cellType)) {
                     nextDataType = xssfDataType.BOOL;
-                else if ("e".equals(cellType))
+                } else if ("e".equals(cellType)) {
                     nextDataType = xssfDataType.ERROR;
-                else if ("inlineStr".equals(cellType))
+                } else if ("inlineStr".equals(cellType)) {
                     nextDataType = xssfDataType.INLINESTR;
-                else if ("s".equals(cellType))
+                } else if ("s".equals(cellType)) {
                     nextDataType = xssfDataType.SSTINDEX;
-                else if ("str".equals(cellType))
+                } else if ("str".equals(cellType)) {
                     nextDataType = xssfDataType.FORMULA;
-                else if (cellStyleStr != null) {
+                } else if (cellStyleStr != null) {
                     // It's a number, but almost certainly one
                     //  with a special style or format 
-                    XSSFCellStyle style = null;
-                    if (cellStyleStr != null) {
-                        int styleIndex = Integer.parseInt(cellStyleStr);
-                        style = stylesTable.getStyleAt(styleIndex);
-                    }
+                    int styleIndex = Integer.parseInt(cellStyleStr);
+                    XSSFCellStyle style = stylesTable.getStyleAt(styleIndex);
                     if (style == null && stylesTable.getNumCellStyles() > 0) {
                         style = stylesTable.getStyleAt(0);
                     }
                     if (style != null) {
                         this.formatIndex = style.getDataFormat();
                         this.formatString = style.getDataFormatString();
-                        if (this.formatString == null)
+                        if (this.formatString == null) {
                             this.formatString = BuiltinFormats.getBuiltinFormat(this.formatIndex);
+                        }
                     }
                 }
             }
diff --git a/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java b/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java
index 2c37ea08d2..4ebaa46fc5 100644
--- a/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java
+++ b/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java
@@ -18,6 +18,7 @@
 package org.apache.poi.xssf.usermodel.examples;
 
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -33,7 +34,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 public class CreateUserDefinedDataFormats {
 
 
-    public static void main(String[]args) throws Exception {
+    public static void main(String[]args) throws IOException {
         Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
         Sheet sheet = wb.createSheet("format sheet");
         CellStyle style;
@@ -43,14 +44,14 @@ public class CreateUserDefinedDataFormats {
         short rowNum = 0;
         short colNum = 0;
 
-        row = sheet.createRow(rowNum++);
+        row = sheet.createRow(rowNum);
         cell = row.createCell(colNum);
         cell.setCellValue(11111.25);
         style = wb.createCellStyle();
         style.setDataFormat(format.getFormat("0.0"));
         cell.setCellStyle(style);
 
-        row = sheet.createRow(rowNum++);
+        row = sheet.createRow(++rowNum);
         cell = row.createCell(colNum);
         cell.setCellValue(11111.25);
         style = wb.createCellStyle();
@@ -60,6 +61,8 @@ public class CreateUserDefinedDataFormats {
         FileOutputStream fileOut = new FileOutputStream("ooxml_dataFormat.xlsx");
         wb.write(fileOut);
         fileOut.close();
+        
+        wb.close();
     }
 
 }
diff --git a/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java b/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java
index 45bee91d6f..43a6b48475 100644
--- a/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java
+++ b/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java
@@ -17,18 +17,19 @@
 package org.apache.poi.xssf.usermodel.examples;
 
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-public class SelectedSheet {
-
-    public static void main(String[]args) throws Exception {
+public abstract class SelectedSheet {
+    
+    public static void main(String[]args) throws IOException {
         Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
 
-        Sheet sheet = wb.createSheet("row sheet");
-        Sheet sheet2 = wb.createSheet("another sheet");
+        wb.createSheet("row sheet");
+        wb.createSheet("another sheet");
         Sheet sheet3 = wb.createSheet(" sheet 3 ");
         sheet3.setSelected(true);
         wb.setActiveSheet(2);
@@ -38,6 +39,8 @@ public class SelectedSheet {
         FileOutputStream fileOut = new FileOutputStream("selectedSheet.xlsx");
         wb.write(fileOut);
         fileOut.close();
+        
+        wb.close();
     }
 
 }
diff --git a/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java b/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
index b9fe93a668..12313b78e4 100644
--- a/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
+++ b/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
@@ -33,7 +33,8 @@ import org.junit.Test;
 public class HDGFFileHandler extends POIFSFileHandler {
 	@Override
 	public void handleFile(InputStream stream) throws Exception {
-		HDGFDiagram diagram = new HDGFDiagram(new POIFSFileSystem(stream));
+	    POIFSFileSystem poifs = new POIFSFileSystem(stream);
+		HDGFDiagram diagram = new HDGFDiagram(poifs);
 		Stream[] topLevelStreams = diagram.getTopLevelStreams();
 		assertNotNull(topLevelStreams);
 		for(Stream str : topLevelStreams) {
@@ -44,6 +45,8 @@ public class HDGFFileHandler extends POIFSFileHandler {
 		assertNotNull(trailerStream);
 		assertTrue(trailerStream.getPointer().getLength() >= 0);
 		
+		poifs.close();
+		
 		// writing is not yet implemented... handlePOIDocument(diagram);
 	}
 	
diff --git a/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java b/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
index a56ddd2dc6..ead35e47bb 100644
--- a/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
+++ b/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
@@ -18,21 +18,14 @@ package org.apache.poi.stress;
 
 import static org.junit.Assert.assertNotNull;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
-import org.apache.poi.hdf.extractor.WordDocument;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.junit.Test;
 
-@SuppressWarnings("deprecation")
 public class HWPFFileHandler extends POIFSFileHandler {
 	@Override
 	public void handleFile(InputStream stream) throws Exception {
@@ -42,25 +35,6 @@ public class HWPFFileHandler extends POIFSFileHandler {
 		assertNotNull(doc.getEndnotes());
 		
 		handlePOIDocument(doc);
-		
-		// fails for many documents, but is deprecated anyway... 
-		// handleWordDocument(doc);
-	}
-
-	protected void handleWordDocument(HWPFDocument doc) throws IOException {
-		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-		doc.write(outStream);
-
-		WordDocument wordDoc = new WordDocument(new ByteArrayInputStream(outStream.toByteArray()));
-        
-        StringWriter docTextWriter = new StringWriter();
-        PrintWriter out = new PrintWriter(docTextWriter);
-        try {
-        	wordDoc.writeAllText(out);
-        } finally {
-        	out.close();
-        }
-        docTextWriter.close();
 	}
 
 	// a test-case to test this locally without executing the full TestAllFiles
diff --git a/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java b/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
index 5c4a36e3ca..8c442ca8de 100644
--- a/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
+++ b/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
@@ -31,6 +31,7 @@ public class POIFSFileHandler extends AbstractFileHandler {
     public void handleFile(InputStream stream) throws Exception {
 		POIFSFileSystem fs = new POIFSFileSystem(stream);
 		handlePOIFSFileSystem(fs);
+		fs.close();
 	}
 
 	private void handlePOIFSFileSystem(POIFSFileSystem fs) {
@@ -45,5 +46,6 @@ public class POIFSFileHandler extends AbstractFileHandler {
 		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
 		POIFSFileSystem fs = new POIFSFileSystem(in);
 		handlePOIFSFileSystem(fs);
+		fs.close();
 	}
 }
diff --git a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
index d0dea877f5..fc09ca6e8a 100644
--- a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
@@ -23,7 +23,7 @@ class IndirectPropertyName
 {
     private CodePageString _value;
 
-    IndirectPropertyName( byte[] data, int offset )
+    IndirectPropertyName( byte[] data, int offset ) //NOSONAR
     {
         _value = new CodePageString( data, offset );
     }
diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/src/java/org/apache/poi/hssf/record/SSTRecord.java
index abbf909681..2c0730a4fa 100644
--- a/src/java/org/apache/poi/hssf/record/SSTRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SSTRecord.java
@@ -296,15 +296,17 @@ public final class SSTRecord extends ContinuableRecord {
      * @return  The new SST record.
      */
     public ExtSSTRecord createExtSSTRecord(int sstOffset) {
-        if (bucketAbsoluteOffsets == null || bucketAbsoluteOffsets == null)
+        if (bucketAbsoluteOffsets == null || bucketRelativeOffsets == null) {
             throw new IllegalStateException("SST record has not yet been serialized.");
+        }
 
         ExtSSTRecord extSST = new ExtSSTRecord();
         extSST.setNumStringsPerBucket((short)8);
         int[] absoluteOffsets = bucketAbsoluteOffsets.clone();
         int[] relativeOffsets = bucketRelativeOffsets.clone();
-        for ( int i = 0; i < absoluteOffsets.length; i++ )
+        for ( int i = 0; i < absoluteOffsets.length; i++ ) {
             absoluteOffsets[i] += sstOffset;
+        }
         extSST.setBucketOffsets(absoluteOffsets, relativeOffsets);
         return extSST;
     }
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
index ccf57a6553..23f028b66b 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
@@ -244,10 +244,12 @@ public abstract class OPCPackage implements RelationshipSource, Closeable {
     */
    public static OPCPackage open(File file, PackageAccess access)
          throws InvalidFormatException {
-      if (file == null)
-			throw new IllegalArgumentException("'file' must be given");
-      if (file == null || (file.exists() && file.isDirectory()))
-			throw new IllegalArgumentException("file must not be a directory");
+      if (file == null) {
+          throw new IllegalArgumentException("'file' must be given");
+      }
+      if (file.exists() && file.isDirectory()) {
+          throw new IllegalArgumentException("file must not be a directory");
+      }
 
       OPCPackage pack = new ZipPackage(file, access);
       if (pack.partList == null && access != PackageAccess.WRITE) {
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
index cd3cbf0563..c38d027ba2 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
@@ -54,7 +54,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
     private Long checksum = null;
 
     // original image dimensions (for formats supported by BufferedImage)
-    private Dimension _origSize = null;
+    private Dimension origSize = null;
     private int index = -1;
 
     /**
@@ -107,8 +107,9 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
      */
     public String getFileName() {
         String name = getPackagePart().getPartName().getName();
-        if (name == null)
+        if (name == null) {
             return null;
+        }
         return name.substring(name.lastIndexOf('/') + 1);
     }
 
@@ -132,7 +133,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
     @Override
     public Dimension getImageDimension() {
         cacheProperties();
-        return _origSize;
+        return origSize;
     }
 
     @Override
@@ -148,21 +149,21 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
      * Determine and cache image properties
      */
     protected void cacheProperties() {
-        if (_origSize == null || checksum == null) {
+        if (origSize == null || checksum == null) {
             byte data[] = getData();
             checksum = IOUtils.calculateChecksum(data);
             
             switch (getType()) {
             case EMF:
-                _origSize = new EMF.NativeHeader(data, 0).getSize();
+                origSize = new EMF.NativeHeader(data, 0).getSize();
                 break;
             case WMF:
                 // wmf files in pptx usually have their placeable header 
                 // stripped away, so this returns only the dummy size
-                _origSize = new WMF.NativeHeader(data, 0).getSize();
+                origSize = new WMF.NativeHeader(data, 0).getSize();
                 break;
             case PICT:
-                _origSize = new PICT.NativeHeader(data, 0).getSize();
+                origSize = new PICT.NativeHeader(data, 0).getSize();
                 break;
             default:
                 BufferedImage img = null;
@@ -172,7 +173,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
                     logger.log(POILogger.WARN, "Can't determine image dimensions", e);
                 }
                 // set dummy size, in case of dummy dimension can't be set
-                _origSize = (img == null)
+                origSize = (img == null)
                     ? new Dimension(200,200)
                     : new Dimension(
                         (int)Units.pixelToPoints(img.getWidth()),
@@ -204,7 +205,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
         // recalculate now since we already have the data bytes available anyhow
         checksum = IOUtils.calculateChecksum(data);
 
-        _origSize = null; // need to recalculate image size
+        origSize = null; // need to recalculate image size
     }
 
     @Override
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
index d685aefca0..0085fddb64 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
@@ -112,8 +112,9 @@ public class XWPFPictureData extends POIXMLDocumentPart {
      */
     public String getFileName() {
         String name = getPackagePart().getPartName().getName();
-        if (name == null)
+        if (name == null) {
             return null;
+        }
         return name.substring(name.lastIndexOf('/') + 1);
     }
 

diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java b/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
deleted file mode 100644
index 6ff414fcde..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/* ====================================================================
-   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.hdf.event;
-
-
-import org.apache.poi.hdf.model.util.BTreeSet;
-import org.apache.poi.hdf.model.util.NumberFormatter;
-import org.apache.poi.hdf.model.hdftypes.*;
-import org.apache.poi.util.LittleEndian;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Deprecated
-public final class EventBridge implements HDFLowLevelParsingListener
-{
-
-  private static int HEADER_EVEN_INDEX = 0;
-  private static int HEADER_ODD_INDEX = 1;
-  private static int FOOTER_EVEN_INDEX = 2;
-  private static int FOOTER_ODD_INDEX = 3;
-  private static int HEADER_FIRST_INDEX = 4;
-  private static int FOOTER_FIRST_INDEX = 5;
-
-  /** This class translates low level events into high level events for this
-  *   listener */
-  HDFParsingListener _listener;
-  /** stylesheet for this document */
-  StyleSheet _stsh;
-  /** name says it all */
-  DocumentProperties _dop;
-  /** StyleDescription for the current paragraph. */
-  StyleDescription _currentStd;
-  /** List info for this doc */
-  ListTables _listTables;
-
-
-  /** "WordDocument" from the POIFS */
-  byte[] _mainDocument;
-  /** Table0 or Table1 from POIFS */
-  byte[] _tableStream;
-
-  /** text offset in main stream */
-  int _fcMin;
-  int _ccpText;
-  int _ccpFtn;
-  int _hdrSize;
-  int _hdrOffset;
-
-  /** text pieces */
-  BTreeSet _text = new BTreeSet();
-
-  private boolean _beginHeaders;
-  BTreeSet _hdrSections = new BTreeSet();
-  BTreeSet _hdrParagraphs = new BTreeSet();
-  BTreeSet _hdrCharacterRuns = new BTreeSet();
-
-  int _sectionCounter = 1;
-  List<HeaderFooter[]> _hdrs = new ArrayList<HeaderFooter[]>();
-
-  private boolean _holdParagraph = false;
-  private int _endHoldIndex = -1;
-  private List<PropertyNode> _onHold;
-
-  public EventBridge(HDFParsingListener listener)
-  {
-    _listener = listener;
-  }
-  public void mainDocument(byte[] mainDocument) {
-      if (mainDocument == null) {
-          throw new IllegalArgumentException("mainDocument is null.");
-      }
-    _mainDocument = mainDocument.clone();
-  }
-  public void tableStream(byte[] tableStream) {
-      if (tableStream == null) {
-          throw new IllegalArgumentException("tableStream is null.");
-      }
-      _tableStream = tableStream.clone();
-  }
-  public void miscellaneous(int fcMin, int ccpText, int ccpFtn, int fcPlcfhdd, int lcbPlcfhdd)
-  {
-    _fcMin = fcMin;
-    _ccpText = ccpText;
-    _ccpFtn = ccpFtn;
-    _hdrOffset = fcPlcfhdd;
-    _hdrSize = lcbPlcfhdd;
-  }
-  public void document(DocumentProperties dop)
-  {
-    _dop = dop;
-  }
-  public void bodySection(SepxNode sepx)
-  {
-    SectionProperties sep = (SectionProperties)StyleSheet.uncompressProperty(sepx.getSepx(), new SectionProperties(), _stsh);
-    HeaderFooter[] hdrArray = findSectionHdrFtrs(_sectionCounter);
-    _hdrs.add(hdrArray);
-    _listener.section(sep, sepx.getStart() - _fcMin, sepx.getEnd() - _fcMin);
-    _sectionCounter++;
-  }
-
-  public void hdrSection(SepxNode sepx)
-  {
-    _beginHeaders = true;
-    _hdrSections.add(sepx);
-  }
-  public void endSections()
-  {
-    for (int x = 1; x < _sectionCounter; x++)
-    {
-      HeaderFooter[] hdrArray = _hdrs.get(x-1);
-      HeaderFooter hf = null;
-
-      if (!hdrArray[HeaderFooter.HEADER_EVEN - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.HEADER_EVEN - 1];
-        _listener.header(x - 1, HeaderFooter.HEADER_EVEN);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-      if (!hdrArray[HeaderFooter.HEADER_ODD - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.HEADER_ODD - 1];
-        _listener.header(x - 1, HeaderFooter.HEADER_ODD);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-      if (!hdrArray[HeaderFooter.FOOTER_EVEN - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.FOOTER_EVEN - 1];
-        _listener.footer(x - 1, HeaderFooter.FOOTER_EVEN);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-      if (!hdrArray[HeaderFooter.FOOTER_ODD - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.FOOTER_EVEN - 1];
-        _listener.footer(x - 1, HeaderFooter.FOOTER_EVEN);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-      if (!hdrArray[HeaderFooter.HEADER_FIRST - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.HEADER_FIRST - 1];
-        _listener.header(x - 1, HeaderFooter.HEADER_FIRST);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-      if (!hdrArray[HeaderFooter.FOOTER_FIRST - 1].isEmpty())
-      {
-        hf = hdrArray[HeaderFooter.FOOTER_FIRST - 1];
-        _listener.footer(x - 1, HeaderFooter.FOOTER_FIRST);
-        flushHeaderProps(hf.getStart(), hf.getEnd());
-      }
-    }
-  }
-
-
-
-  public void paragraph(PapxNode papx)
-  {
-    if (_beginHeaders)
-    {
-      _hdrParagraphs.add(papx);
-    }
-    byte[] bytePapx = papx.getPapx();
-    int istd = LittleEndian.getShort(bytePapx, 0);
-    _currentStd = _stsh.getStyleDescription(istd);
-
-    ParagraphProperties pap = (ParagraphProperties)StyleSheet.uncompressProperty(bytePapx, _currentStd.getPAP(), _stsh);
-
-    if (pap.getFTtp() > 0)
-    {
-      TableProperties tap = (TableProperties)StyleSheet.uncompressProperty(bytePapx, new TableProperties(), _stsh);
-      _listener.tableRowEnd(tap, papx.getStart() - _fcMin, papx.getEnd() - _fcMin);
-    }
-    else if (pap.getIlfo() > 0)
-    {
-      _holdParagraph = true;
-      _endHoldIndex = papx.getEnd();
-      _onHold.add(papx);
-    }
-    else
-    {
-      _listener.paragraph(pap, papx.getStart() - _fcMin, papx.getEnd() - _fcMin);
-    }
-  }
-
-  public void characterRun(ChpxNode chpx)
-  {
-    if (_beginHeaders)
-    {
-      _hdrCharacterRuns.add(chpx);
-    }
-
-    int start = chpx.getStart();
-    int end = chpx.getEnd();
-    //check to see if we should hold this characterRun
-    if (_holdParagraph)
-    {
-      _onHold.add(chpx);
-      if (end >= _endHoldIndex)
-      {
-        _holdParagraph = false;
-        _endHoldIndex = -1;
-        flushHeldParagraph();
-        _onHold = new ArrayList<PropertyNode>();
-      }
-    }
-
-    byte[] byteChpx = chpx.getChpx();
-
-
-    CharacterProperties chp = (CharacterProperties)StyleSheet.uncompressProperty(byteChpx, _currentStd.getCHP(), _stsh);
-
-    List<PropertyNode> textList = BTreeSet.findProperties(start, end, _text.root);
-    String text = getTextFromNodes(textList, start, end);
-
-    _listener.characterRun(chp, text, start - _fcMin, end - _fcMin);
-  }
-  public void text(TextPiece t)
-  {
-    _text.add(t);
-  }
-  public void fonts(FontTable fontTbl)
-  {
-  }
-  public void lists(ListTables listTbl)
-  {
-    _listTables = listTbl;
-  }
-  public void styleSheet(StyleSheet stsh)
-  {
-    _stsh = stsh;
-  }
-  private void flushHeaderProps(int start, int end)
-  {
-    List<PropertyNode> list = BTreeSet.findProperties(start, end, _hdrSections.root);
-    int size = list.size();
-
-    for (int x = 0; x < size; x++)
-    {
-      SepxNode oldNode = (SepxNode)list.get(x);
-      int secStart = Math.max(oldNode.getStart(), start);
-      int secEnd = Math.min(oldNode.getEnd(), end);
-
-      //SepxNode node = new SepxNode(-1, secStart, secEnd, oldNode.getSepx());
-      //bodySection(node);
-
-      List<PropertyNode> parList = BTreeSet.findProperties(secStart, secEnd, _hdrParagraphs.root);
-      int parSize = parList.size();
-
-      for (int y = 0; y < parSize; y++)
-      {
-        PapxNode oldParNode = (PapxNode)parList.get(y);
-        int parStart = Math.max(oldParNode.getStart(), secStart);
-        int parEnd = Math.min(oldParNode.getEnd(), secEnd);
-
-        PapxNode parNode = new PapxNode(parStart, parEnd, oldParNode.getPapx());
-        paragraph(parNode);
-
-        List<PropertyNode> charList = BTreeSet.findProperties(parStart, parEnd, _hdrCharacterRuns.root);
-        int charSize = charList.size();
-
-        for (int z = 0; z < charSize; z++)
-        {
-          ChpxNode oldCharNode = (ChpxNode)charList.get(z);
-          int charStart = Math.max(oldCharNode.getStart(), parStart);
-          int charEnd = Math.min(oldCharNode.getEnd(), parEnd);
-
-          ChpxNode charNode = new ChpxNode(charStart, charEnd, oldCharNode.getChpx());
-          characterRun(charNode);
-        }
-      }
-
-    }
-
-  }
-  private String getTextFromNodes(List<PropertyNode> list, int start, int end)
-  {
-    int size = list.size();
-
-    StringBuffer sb = new StringBuffer();
-
-    for (int x = 0; x < size; x++)
-    {
-      TextPiece piece = (TextPiece)list.get(x);
-      int charStart = Math.max(start, piece.getStart());
-      int charEnd = Math.min(end, piece.getEnd());
-
-      if(piece.usesUnicode())
-      {
-        for (int y = charStart; y < charEnd; y += 2)
-        {
-          sb.append((char)LittleEndian.getShort(_mainDocument, y));
-        }
-      }
-      else
-      {
-        for (int y = charStart; y < charEnd; y++)
-        {
-          sb.append(_mainDocument[y]);
-        }
-      }
-    }
-    return sb.toString();
-  }
-
-  private void flushHeldParagraph()
-  {
-    PapxNode papx = (PapxNode)_onHold.get(0);
-    byte[] bytePapx = papx.getPapx();
-    int istd = LittleEndian.getShort(bytePapx, 0);
-    StyleDescription std = _stsh.getStyleDescription(istd);
-
-    ParagraphProperties pap = (ParagraphProperties)StyleSheet.uncompressProperty(bytePapx, _currentStd.getPAP(), _stsh);
-    LVL lvl = _listTables.getLevel(pap.getIlfo(), pap.getIlvl());
-    pap = (ParagraphProperties)StyleSheet.uncompressProperty(lvl._papx, pap, _stsh, false);
-
-    int size = _onHold.size() - 1;
-
-    CharacterProperties numChp = (CharacterProperties)StyleSheet.uncompressProperty(((ChpxNode)_onHold.get(size)).getChpx(), std.getCHP(), _stsh);
-
-    numChp = (CharacterProperties)StyleSheet.uncompressProperty(lvl._chpx, numChp, _stsh);
-    String bulletText = getBulletText(lvl, pap);
-
-    _listener.listEntry(bulletText, numChp, pap, papx.getStart() - _fcMin, papx.getEnd() - _fcMin);
-    for (int x = 1; x <= size; x++)
-    {
-      characterRun((ChpxNode)_onHold.get(x));
-    }
-
-  }
-
-  private String getBulletText(LVL lvl, ParagraphProperties pap)
-  {
-    StringBuffer bulletBuffer = new StringBuffer();
-    for(int x = 0; x < lvl._xst.length; x++)
-    {
-      if(lvl._xst[x] < 9)
-      {
-        LVL numLevel = _listTables.getLevel(pap.getIlfo(), lvl._xst[x]);
-        int num = numLevel._iStartAt;
-        if(lvl == numLevel)
-        {
-          numLevel._iStartAt++;
-        }
-        else if(num > 1)
-        {
-          num--;
-        }
-        bulletBuffer.append(NumberFormatter.getNumber(num, lvl._nfc));
-
-      }
-      else
-      {
-        bulletBuffer.append(lvl._xst[x]);
-      }
-
-    }
-
-    switch (lvl._ixchFollow)
-    {
-      case 0:
-        bulletBuffer.append('\u0009');
-        break;
-      case 1:
-        bulletBuffer.append(' ');
-        break;
-    }
-    return bulletBuffer.toString();
-  }
-
-  private HeaderFooter[] findSectionHdrFtrs(int index)
-  {
-    HeaderFooter[] hdrArray = new HeaderFooter[6];
-
-    for (int x = 1; x < 7; x++)
-    {
-      hdrArray[x-1] = createSectionHdrFtr(index, x);
-    }
-
-    return hdrArray;
-  }
-
-  private HeaderFooter createSectionHdrFtr(int index, int type)
-  {
-    if(_hdrSize < 50)
-    {
-      return new HeaderFooter(0,0,0);
-    }
-
-    int start = _fcMin + _ccpText + _ccpFtn;
-    int end = start;
-    int arrayIndex = 0;
-
-    switch(type)
-    {
-      case HeaderFooter.HEADER_EVEN:
-           arrayIndex = (HEADER_EVEN_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_EVEN:
-           arrayIndex = (FOOTER_EVEN_INDEX + (index * 6));
-           break;
-      case HeaderFooter.HEADER_ODD:
-           arrayIndex = (HEADER_ODD_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_ODD:
-           arrayIndex = (FOOTER_ODD_INDEX + (index * 6));
-           break;
-      case HeaderFooter.HEADER_FIRST:
-           arrayIndex = (HEADER_FIRST_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_FIRST:
-           arrayIndex = (FOOTER_FIRST_INDEX + (index * 6));
-           break;
-    }
-    start += LittleEndian.getInt(_tableStream, _hdrOffset + (arrayIndex * 4));
-    end += LittleEndian.getInt(_tableStream, _hdrOffset + (arrayIndex + 1) * 4);
-
-    HeaderFooter retValue = new HeaderFooter(type, start, end);
-
-    if((end - start) == 0 && index > 1)
-    {
-      retValue = createSectionHdrFtr(type, index - 1);
-    }
-    return retValue;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java b/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
deleted file mode 100644
index 6e087bf5f3..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   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.hdf.event;
-
-import org.apache.poi.hdf.model.hdftypes.ChpxNode;
-import org.apache.poi.hdf.model.hdftypes.PapxNode;
-import org.apache.poi.hdf.model.hdftypes.SepxNode;
-import org.apache.poi.hdf.model.hdftypes.TextPiece;
-import org.apache.poi.hdf.model.hdftypes.DocumentProperties;
-import org.apache.poi.hdf.model.hdftypes.FontTable;
-import org.apache.poi.hdf.model.hdftypes.ListTables;
-import org.apache.poi.hdf.model.hdftypes.StyleSheet;
-
-@Deprecated
-public interface HDFLowLevelParsingListener
-{
-  public void mainDocument(byte[] mainDocument);
-  public void tableStream(byte[] tableStream);
-  public void document(DocumentProperties dop);
-  public void bodySection(SepxNode sepx);
-  public void paragraph(PapxNode papx);
-  public void characterRun(ChpxNode chpx);
-  public void hdrSection(SepxNode sepx);
-  public void endSections();
-  public void text(TextPiece t);
-  public void fonts(FontTable fontTbl);
-  public void lists(ListTables listTbl);
-  public void styleSheet(StyleSheet stsh);
-  public void miscellaneous(int fcMin, int ccpText, int ccpFtn, int fcPlcfhdd, int lcbPlcfhdd);
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java b/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
deleted file mode 100644
index 4221d09c5b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   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.hdf.event;
-
-import org.apache.poi.hdf.model.hdftypes.SectionProperties;
-import org.apache.poi.hdf.model.hdftypes.CharacterProperties;
-import org.apache.poi.hdf.model.hdftypes.ParagraphProperties;
-import org.apache.poi.hdf.model.hdftypes.TableProperties;
-import org.apache.poi.hdf.model.hdftypes.DocumentProperties;
-
-@Deprecated
-public interface HDFParsingListener
-{
-  public void document(DocumentProperties dop);
-  public void section(SectionProperties sep, int start, int end);
-  public void paragraph(ParagraphProperties pap, int start, int end);
-  public void listEntry(String bulletText, CharacterProperties bulletProperties, ParagraphProperties pap, int start, int end);
-  public void paragraphInTableRow(ParagraphProperties pap, int start, int end);
-  public void characterRun(CharacterProperties chp, String text, int start, int end);
-  public void tableRowEnd(TableProperties tap, int start, int end);
-  public void header(int sectionIndex, int type);
-  public void footer(int sectionIndex, int type);
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
deleted file mode 100644
index bf6ff7ac2f..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class CHP implements Cloneable
-{
-  boolean _bold;
-  boolean _italic;
-  boolean _fRMarkDel;
-  boolean _fOutline;
-  boolean _fSmallCaps;
-  boolean _fCaps;
-  boolean _fVanish;
-  boolean _fRMark;
-  boolean _fSpec;
-  boolean _fStrike;
-  boolean _fObj;
-  boolean _fShadow;
-  boolean _fLowerCase;
-  boolean _fData;
-  boolean _fOle2;
-  boolean _fEmboss;
-  boolean _fImprint;
-  boolean _fDStrike;
-
-  short _ftcAscii;
-  short _ftcFE;
-  short _ftcOther;
-  short _ftc;
-  int _hps;//font size in half points
-  int _dxaSpace;//space following each character in the run expressed in twip units
-  byte _iss;//superscript/subscript indices 0 means no super/subscripting 1 means text in run is superscripted 2 means text in run is subscripted
-  byte _kul;//underline code see spec
-  byte _ico;//color of text see spec
-  short _hpsPos;//super/subscript position in half points; positive means text is raised; negative means text is lowered
-  short _lidDefault;//language for non-Far East text
-  short _lidFE;//language for Far East text
-  byte _idctHint;
-  int _wCharScale;
-  short _chse;
-
-  int _specialFC;//varies depending on whether this is a special char
-  short _ibstRMark;//index to author IDs stored in hsttbfRMark. used when text in run was newly typed when revision marking was enabled
-  short _ibstRMarkDel;//index to author IDs stored in hsttbfRMark. used when text in run was newly typed when revision marking was enabled
-  int[] _dttmRMark = new int[2];//Date/time at which this run of text was
-  int[] _dttmRMarkDel = new int[2];//entered/modified by the author. (Only
-                                     //recorded when revision marking is on.)Date/time at which this run of text was deleted by the author. (Only recorded when revision marking is on.)
-  int _istd;
-  int _baseIstd = -1;
-  int _fcPic;
-  short _ftcSym;// see spec
-  short _xchSym;//see spec
-  byte _ysr;//hyphenation rules
-  byte _chYsr;//used for hyphenation see spec
-  int _hpsKern;//kerning distance for characters in run recorded in half points
-  int _fcObj;
-  byte _icoHighlight;//highlight color
-  boolean _fChsDiff;
-  boolean _highlighted;//when true characters are highlighted with color specified by chp.icoHighlight
-  boolean _fPropMark;//when true, properties have been changed with revision marking on
-  short _ibstPropRMark;//index to author IDs stored in hsttbfRMark. used when properties have been changed when revision marking was enabled
-  int _dttmPropRMark;//Date/time at which properties of this were changed for this run of text by the author
-  byte _sfxtText;//text animation see spec
-  boolean _fDispFldRMark;//see spec
-  short _ibstDispFldRMark;//Index to author IDs stored in hsttbfRMark. used when ListNum field numbering has been changed when revision marking was enabled
-  int _dttmDispFldRMark;//The date for the ListNum field number change
-  byte[] _xstDispFldRMark = new byte[32];//The string value of the ListNum field when revision mark tracking began
-  short _shd;//shading
-  short[] _brc = new short[2];//border
-  short _paddingStart = 0;
-  short _paddingEnd = 0;
-
-  public CHP()
-  {
-      _istd = 10;
-      _hps = 20;
-      _lidDefault = 0x0400;
-      _lidFE = 0x0400;
-
-  }
-  public void copy(CHP toCopy)
-  {
-      _bold = toCopy._bold;
-      _italic = toCopy._italic;
-       _fRMarkDel = toCopy._fRMarkDel;
-       _fOutline = toCopy._fOutline;
-       _fSmallCaps = toCopy._fSmallCaps;
-       _fCaps = toCopy._fCaps;
-       _fVanish = toCopy._fVanish;
-       _fRMark = toCopy._fRMark;
-       _fSpec = toCopy._fSpec;
-       _fStrike = toCopy._fStrike;
-       _fObj = toCopy._fObj;
-       _fShadow = toCopy._fShadow;
-       _fLowerCase = toCopy._fLowerCase;
-       _fData = toCopy._fData;
-       _fOle2 = toCopy._fOle2;
-       _fEmboss = toCopy._fEmboss;
-       _fImprint = toCopy._fImprint;
-       _fDStrike = toCopy._fDStrike;
-
-       _ftcAscii = toCopy._ftcAscii;
-       _ftcFE = toCopy._ftcFE;
-       _ftcOther = toCopy._ftcOther;
-       _ftc = toCopy._ftc;
-       _hps = toCopy._hps;
-       _dxaSpace = toCopy._dxaSpace;
-       _iss = toCopy._iss;
-       _kul = toCopy._kul;
-       _ico = toCopy._ico;
-       _hpsPos = toCopy._hpsPos;
-       _lidDefault = toCopy._lidDefault;
-       _lidFE = toCopy._lidFE;
-       _idctHint = toCopy._idctHint;
-       _wCharScale = toCopy._wCharScale;
-       _chse = toCopy._chse;
-
-       _specialFC = toCopy._specialFC;
-       _ibstRMark = toCopy._ibstRMark;
-       _ibstRMarkDel = toCopy._ibstRMarkDel;
-       _dttmRMark = toCopy._dttmRMark;
-       _dttmRMarkDel  = toCopy._dttmRMarkDel;
-
-       _istd = toCopy._istd;
-       _baseIstd = toCopy._baseIstd;
-       _fcPic = toCopy._fcPic;
-       _ftcSym = toCopy._ftcSym;
-       _xchSym = toCopy._xchSym;
-       _ysr = toCopy._ysr;
-       _chYsr = toCopy._chYsr;
-       _hpsKern = toCopy._hpsKern;
-       _fcObj = toCopy._fcObj;
-       _icoHighlight = toCopy._icoHighlight;
-       _fChsDiff = toCopy._fChsDiff;
-       _highlighted = toCopy._highlighted;
-       _fPropMark = toCopy._fPropMark;
-       _ibstPropRMark = toCopy._ibstPropRMark;
-       _dttmPropRMark = toCopy._dttmPropRMark;
-       _sfxtText = toCopy._sfxtText;
-       _fDispFldRMark = toCopy._fDispFldRMark;
-       _ibstDispFldRMark = toCopy._ibstDispFldRMark;
-       _dttmDispFldRMark = toCopy._dttmDispFldRMark;
-       _xstDispFldRMark = toCopy._xstDispFldRMark;
-       _shd = toCopy._shd;
-       _brc = toCopy._brc;
-
-  }
-
-  public Object clone() throws CloneNotSupportedException
-  {
-    CHP clone = (CHP)super.clone();
-    clone._brc = new short[2];
-    System.arraycopy(_brc, 0, clone._brc, 0, 2);
-    return clone;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
deleted file mode 100644
index f51c5078b8..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class FontTable
-{
-  String[] fontNames;
-
-  public FontTable(byte[] fontTable)
-  {
-    int size = Utils.convertBytesToShort(fontTable, 0);
-    fontNames = new String[size];
-
-    int currentIndex = 4;
-    for(int x = 0; x < size; x++)
-    {
-      byte ffnLength = fontTable[currentIndex];
-
-      int nameOffset = currentIndex + 40;
-      StringBuffer nameBuf = new StringBuffer();
-      char ch = Utils.getUnicodeCharacter(fontTable, nameOffset);
-      while(ch != '\0')
-      {
-        nameBuf.append(ch);
-        nameOffset += 2;
-        ch = Utils.getUnicodeCharacter(fontTable, nameOffset);
-      }
-      fontNames[x] = nameBuf.toString();
-      if(fontNames[x].startsWith("Times"))
-      {
-        fontNames[x] = "Times";
-      }
-
-      currentIndex += ffnLength + 1;
-    }
-
-  }
-  public String getFont(int index)
-  {
-    return fontNames[index];
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
deleted file mode 100644
index 41fbb623a4..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class HeaderFooter
-{
-  public static final int HEADER_EVEN = 1;
-  public static final int HEADER_ODD = 2;
-  public static final int FOOTER_EVEN = 3;
-  public static final int FOOTER_ODD = 4;
-  public static final int HEADER_FIRST = 5;
-  public static final int FOOTER_FIRST = 6;
-
-  private int _type;
-  private int _start;
-  private int _end;
-
-  public HeaderFooter(int type, int startFC, int endFC)
-  {
-    _type = type;
-    _start = startFC;
-    _end = endFC;
-  }
-  public int getStart()
-  {
-    return _start;
-  }
-  public int getEnd()
-  {
-    return _end;
-  }
-  public boolean isEmpty()
-  {
-    return _start - _end == 0;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
deleted file mode 100644
index 1efe14447a..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class NewOleFile extends RandomAccessFile
-{
-    private byte[] LAOLA_ID_ARRAY = new byte[]{(byte)0xd0, (byte)0xcf, (byte)0x11,
-                                               (byte)0xe0, (byte)0xa1, (byte)0xb1,
-                                               (byte)0x1a, (byte)0xe1};
-    private int _num_bbd_blocks;
-    private int _root_startblock;
-    private int _sbd_startblock;
-    private long _size;
-    private int[] _bbd_list;
-    protected int[] _big_block_depot;
-    protected int[] _small_block_depot;
-    Map<String,PropertySet> _propertySetsHT = new HashMap<String,PropertySet>();
-    List<PropertySet> _propertySetsV = new ArrayList<PropertySet>();
-
-    public NewOleFile(String fileName, String mode) throws FileNotFoundException
-    {
-        super(fileName, mode);
-        try
-        {
-            init();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    @SuppressWarnings("unused")
-    private void init() throws IOException
-    {
-
-        for(int x = 0; x < LAOLA_ID_ARRAY.length; x++)
-        {
-            if(LAOLA_ID_ARRAY[x] != readByte())
-            {
-                throw new IOException("Not an OLE file");
-            }
-        }
-        _size = length();
-        _num_bbd_blocks = readInt(0x2c);
-        _root_startblock = readInt(0x30);
-        _sbd_startblock = readInt(0x3c);
-        _bbd_list = new int[_num_bbd_blocks];
-        //populate bbd_list. If _num_bbd_blocks > 109 I have to do it
-        //differently
-        if(_num_bbd_blocks <= 109)
-        {
-            seek(0x4c);
-            for(int x = 0; x < _num_bbd_blocks; x++)
-            {
-                _bbd_list[x] = readIntLE();
-            }
-        }
-        else
-        {
-            populateBbdList();
-        }
-        //populate the big block depot
-        _big_block_depot = new int[_num_bbd_blocks * 128];
-        int counter = 0;
-        for(int x = 0; x < _num_bbd_blocks; x++)
-        {
-            int offset = (_bbd_list[x] + 1) * 512;
-            seek(offset);
-            for(int y = 0; y < 128; y++)
-            {
-                _big_block_depot[counter++] = readIntLE();
-            }
-        }
-        _small_block_depot = createSmallBlockDepot();
-        int[] rootChain = readChain(_big_block_depot, _root_startblock);
-        initializePropertySets(rootChain);
-
-    }
-
-    public static void main(String args[]) throws Exception {
-        NewOleFile nof = new NewOleFile(args[0], "r");
-        nof.close();
-    }
-    
-    protected int[] readChain(int[] blockChain, int startBlock) {
-
-        int[] tempChain = new int[blockChain.length];
-        tempChain[0] = startBlock;
-        int x = 1;
-        for(;;x++)
-        {
-            int nextVal = blockChain[tempChain[x-1]];
-            if(nextVal != -2)
-            {
-                tempChain[x] = nextVal;
-            }
-            else
-            {
-                break;
-            }
-        }
-        int[] newChain = new int[x];
-        System.arraycopy(tempChain, 0, newChain, 0, x);
-
-        return newChain;
-    }
-    private void initializePropertySets(int[] rootChain) throws IOException
-    {
-        for(int x = 0; x < rootChain.length; x++)
-        {
-            int offset = (rootChain[x] + 1) * 512;
-            seek(offset);
-            for(int y = 0; y < 4; y++)
-            {
-                //read the block the makes up the property set
-                byte[] propArray = new byte[128];
-                read(propArray);
-
-                //parse the byte array for properties
-                int nameSize = Utils.convertBytesToShort(propArray[0x41], propArray[0x40])/2 - 1;
-                if(nameSize > 0)
-                {
-                    StringBuffer nameBuffer = new StringBuffer(nameSize);
-                    for(int z = 0; z < nameSize; z++)
-                    {
-                        nameBuffer.append((char)propArray[z*2]);
-                    }
-                    int type = propArray[0x42];
-                    int previous_pps = Utils.convertBytesToInt(propArray[0x47], propArray[0x46], propArray[0x45], propArray[0x44]);
-                    int next_pps = Utils.convertBytesToInt(propArray[0x4b], propArray[0x4a], propArray[0x49], propArray[0x48]);
-                    int pps_dir = Utils.convertBytesToInt(propArray[0x4f], propArray[0x4e], propArray[0x4d], propArray[0x4c]);
-                    int pps_sb = Utils.convertBytesToInt(propArray[0x77], propArray[0x76], propArray[0x75], propArray[0x74]);
-                    int pps_size = Utils.convertBytesToInt(propArray[0x7b], propArray[0x7a], propArray[0x79], propArray[0x78]);
-
-                    PropertySet propSet = new PropertySet(nameBuffer.toString(),
-                                                          type, previous_pps, next_pps,
-                                                          pps_dir, pps_sb, pps_size,
-                                                          (x*4) + y);
-                    _propertySetsHT.put(nameBuffer.toString(), propSet);
-                    _propertySetsV.add(propSet);
-                }
-            }
-        }
-
-    }
-    private int[] createSmallBlockDepot() throws IOException
-    {
-
-        int[] sbd_list = readChain(_big_block_depot, _sbd_startblock);
-        int[] small_block_depot = new int[sbd_list.length * 128];
-
-        for(int x = 0; x < sbd_list.length && sbd_list[x] != -2; x++)
-        {
-            int offset = ((sbd_list[x] + 1) * 512);
-            seek(offset);
-            for(int y = 0; y < 128; y++)
-            {
-                small_block_depot[y] = readIntLE();
-            }
-        }
-        return small_block_depot;
-    }
-
-    private void populateBbdList() throws IOException
-    {
-      seek(0x4c);
-      for(int x = 0; x < 109; x++)
-      {
-          _bbd_list[x] = readIntLE();
-      }
-      int pos = 109;
-      int remainder = _num_bbd_blocks - 109;
-      seek(0x48);
-      int numLists = readIntLE();
-      seek(0x44);
-      int firstList = readIntLE();
-
-      firstList = (firstList + 1) * 512;
-
-      for(int y = 0; y < numLists; y++)
-      {
-        int size = Math.min(127, remainder);
-        for(int z = 0; z < size; z++)
-        {
-          seek(firstList + (z * 4));
-          _bbd_list[pos++] = readIntLE();
-        }
-        if(size == 127)
-        {
-          seek(firstList + (127 * 4));
-          firstList = readIntLE();
-          firstList = (firstList + 1) * 512;
-          remainder -= 127;
-        }
-      }
-
-    }
-    private int readInt(long offset) throws IOException
-    {
-        seek(offset);
-        return readIntLE();
-    }
-    private int readIntLE() throws IOException
-    {
-        byte[] intBytes = new byte[4];
-        read(intBytes);
-        return Utils.convertBytesToInt(intBytes[3], intBytes[2], intBytes[1], intBytes[0]);
-    }
-
-
-
-
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
deleted file mode 100644
index 08ff911791..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PAP implements Cloneable
-{
-  int _istd;//index to style descriptor.
-  byte _jc;//justification code
-  byte _fKeep;//keep entire paragraph on one page if possible
-  byte _fKeepFollow;//keep paragraph on same page with next paragraph if possible
-  byte _fPageBreakBefore;//start this paragraph on new page
-  byte _positionByte;//multiple flags see spec;
-  byte _brcp;//rectangle border codes for Macword 3.0
-  byte _brcl;//border line styles for Macword 3.0
-  byte _ilvl;//when non-zero, list level for this paragraph
-  byte _fNoLnn;//no line numbering for this paragraph. (makes this an exception to the section property of line numbering)
-  int  _ilfo;//when non-zero, (1-based) index into the pllfo identifying the list to which the paragraph belongs
-  byte _fSideBySide;//when 1, paragraph is a side by side paragraph
-  byte _fNoAutoHyph;//when 0, text in paragraph may be auto hyphenated.
-  byte _fWindowControl;//when 1, Word will prevent widowed lines in this paragraph from being placed at the beginning of a page
-  int _dxaRight;//indent from right margin (signed).
-  int _dxaLeft;//indent from left margin (signed)
-  int _dxaLeft1;//first line indent; signed number relative to dxaLeft
-  int[] _lspd = new int[2];//line spacing descriptor see spec
-  int _dyaBefore;// vertical spacing before paragraph (unsigned)
-  int _dyaAfter;//vertical spacing after paragraph (unsigned)
-  byte[] _phe = new byte[12];//height of current paragraph
-  byte _fCrLf;//undocumented
-  byte _fUsePgsuSettings;//undocumented
-  byte _fAdjustRight;//undocumented
-  byte _fKinsoku;// when 1, apply kinsoku rules when performing line wrapping
-  byte _fWordWrap;//when 1, perform word wrap
-  byte _fOverflowPunct;//when 1, apply overflow punctuation rules when performing line wrapping
-  byte _fTopLinePunct;//when 1, perform top line punctuation processing
-  byte _fAutoSpaceDE;//when 1, auto space FE and alphabetic characters
-  byte _fAutoSpaceDN;// when 1, auto space FE and numeric characters
-  int _wAlignFont;//font alignment 0 Hanging 1 Centered 2 Roman 3 Variable 4 Auto
-  short _fontAlign;//multiVal see Spec.
-  byte _fInTable;//when 1, paragraph is contained in a table row
-  byte _fTtp;//when 1, paragraph consists only of the row mark special character and marks the end of a table row
-  byte _wr;//Wrap Code for absolute objects
-  byte _fLocked;//when 1, paragraph may not be edited
-  int _dxaAbs;//see spec
-  int _dyaAbs;//see spec
-  int _dxaWidth;//when not == 0, paragraph is constrained to be dxaWidth wide, independent of current margin or column settings
-  short[] _brcTop = new short[2];//spec for border above paragraph
-  short[] _brcLeft = new short[2];//specification for border to the left of
-  short[] _brcBottom = new short[2];//paragraphspecification for border below
-  short[] _brcRight = new short[2];//paragraphspecification for border to the
-  short[] _brcBetween = new short[2];//right of paragraphsee spec
-  short[] _brcBar = new short[2];//specification of border to place on
-  short _brcTop1;//outside of text when facing pages are to be displayed.spec
-  short _brcLeft1;//for border above paragraphspecification for border to the
-  short _brcBottom1;//left ofparagraphspecification for border below
-  short _brcRight1;//paragraphspecification for border to the
-  short _brcBetween1;//right of paragraphsee spec
-  short _brcBar1;//specification of border to place on outside of text when facing pages are to be displayed.
-  int _dxaFromText;//horizontal distance to be maintained between an absolutely positioned paragraph and any non-absolute positioned text
-  int _dyaFromText;//vertical distance to be maintained between an absolutely positioned paragraph and any non-absolute positioned text
-  int _dyaHeight;//see spec
-  int _shd;//shading
-  int _dcs;//drop cap specifier
-  byte[] _anld = new byte[84];//autonumber list descriptor (see ANLD definition)
-  short _fPropRMark;//when 1, properties have been changed with revision marking on
-  short _ibstPropRMark;//index to author IDs stored in hsttbfRMark. used when properties have been changed when revision marking was enabled
-  byte[] _dttmPropRMark = new byte[4];//Date/time at which properties of this were changed for this run of text by the author. (Only recorded when revision marking is on.)
-  byte[] _numrm = new byte[8];//paragraph numbering revision mark data (see NUMRM)
-  short _itbdMac;//number of tabs stops defined for paragraph. Must be >= 0 and <= 64.
-
-
-
-  public PAP()
-  {
-    _fWindowControl = 1;
-    //lspd[0] = 240;
-    _lspd[1] = 1;
-    _ilvl = 9;
-  }
-  public Object clone() throws CloneNotSupportedException
-  {
-      PAP clone =  (PAP)super.clone();
-
-      clone._brcBar = new short[2];
-      clone._brcBottom = new short[2];
-      clone._brcLeft = new short[2];
-      clone._brcBetween = new short[2];
-      clone._brcRight = new short[2];
-      clone._brcTop = new short[2];
-      clone._lspd = new int[2];
-      clone._phe = new byte[12];
-      clone._anld = new byte[84];
-      clone._dttmPropRMark = new byte[4];
-      clone._numrm = new byte[8];
-
-      System.arraycopy(_brcBar, 0, clone._brcBar, 0, 2);
-      System.arraycopy(_brcBottom, 0, clone._brcBottom, 0, 2);
-      System.arraycopy(_brcLeft, 0, clone._brcLeft, 0, 2);
-      System.arraycopy(_brcBetween, 0, clone._brcBetween, 0, 2);
-      System.arraycopy(_brcRight, 0, clone._brcRight, 0, 2);
-      System.arraycopy(_brcTop, 0, clone._brcTop, 0, 2);
-      System.arraycopy(_lspd, 0, clone._lspd, 0, 2);
-      System.arraycopy(_phe, 0, clone._phe, 0, 12);
-      System.arraycopy(_anld, 0, clone._anld, 0, 84);
-      System.arraycopy(_dttmPropRMark, 0, clone._dttmPropRMark, 0, 4);
-      System.arraycopy(_numrm, 0, clone._numrm, 0, 8);
-
-      return clone;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
deleted file mode 100644
index 3b8f630bac..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PropertySet
-{
-    private String _name;
-    private int _type;
-    private int _previous;
-    private int _next;
-    private int _dir;
-    private int _sb;
-    private int _size;
-    private int _num;
-
-    public PropertySet(String name, int type, int previous, int next, int dir,
-                       int sb, int size, int num)
-    {
-        _name = name;
-        _type = type;
-        _previous = previous;
-        _next = next;
-        _dir = dir;
-        _sb = sb;
-        _size = size;
-        _num = num;
-    }
-    public int getSize()
-    {
-        return _size;
-    }
-    public int getStartBlock()
-    {
-        return _sb;
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
deleted file mode 100644
index 0c136e24c5..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class SEP
-{
-  int _index;
-  byte _bkc;
-  boolean _fTitlePage;
-  boolean _fAutoPgn;
-  byte _nfcPgn;
-  boolean _fUnlocked;
-  byte _cnsPgn;
-  boolean _fPgnRestart;
-  boolean _fEndNote;
-  byte _lnc;
-  byte _grpfIhdt;
-  short _nLnnMod;
-  int _dxaLnn;
-  short _dxaPgn;
-  short _dyaPgn;
-  boolean _fLBetween;
-  byte _vjc;
-  short _dmBinFirst;
-  short _dmBinOther;
-  short _dmPaperReq;
-  short[] _brcTop = new short[2];
-  short[] _brcLeft = new short[2];
-  short[] _brcBottom = new short[2];
-  short[] _brcRight = new short[2];
-  boolean _fPropMark;
-  int _dxtCharSpace;
-  int _dyaLinePitch;
-  short _clm;
-  byte _dmOrientPage;
-  byte _iHeadingPgn;
-  short _pgnStart;
-  short _lnnMin;
-  short _wTextFlow;
-  short _pgbProp;
-  int _xaPage;
-  int _yaPage;
-  int _dxaLeft;
-  int _dxaRight;
-  int _dyaTop;
-  int _dyaBottom;
-  int _dzaGutter;
-  int _dyaHdrTop;
-  int _dyaHdrBottom;
-  short _ccolM1;
-  boolean _fEvenlySpaced;
-  int _dxaColumns;
-  int[] _rgdxaColumnWidthSpacing;
-  byte _dmOrientFirst;
-  byte[] _olstAnn;
-
-
-
-  public SEP()
-  {
-      _bkc = 2;
-      _dyaPgn = 720;
-      _dxaPgn = 720;
-      _fEndNote = true;
-      _fEvenlySpaced = true;
-      _xaPage = 12240;
-      _yaPage = 15840;
-      _dyaHdrTop = 720;
-      _dyaHdrBottom = 720;
-      _dmOrientPage = 1;
-      _dxaColumns = 720;
-      _dyaTop = 1440;
-      _dxaLeft = 1800;
-      _dyaBottom = 1440;
-      _dxaRight = 1800;
-      _pgnStart = 1;
-
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
deleted file mode 100644
index cb8588e587..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class StyleDescription
-{
-
-  private static int PARAGRAPH_STYLE = 1;
-  private static int CHARACTER_STYLE = 2;
-
-  int _baseStyleIndex;
-  int _styleTypeCode;
-  int _numUPX;
-  byte[] _papx;
-  byte[] _chpx;
-  PAP _pap;
-  CHP _chp;
-
-  public StyleDescription()
-  {
-      _pap = new PAP();
-      _chp = new CHP();
-  }
-  public StyleDescription(byte[] std, int baseLength, boolean word9)
-  {
-      int infoShort = Utils.convertBytesToShort(std, 2);
-      _styleTypeCode = (infoShort & 0xf);
-      _baseStyleIndex = (infoShort & 0xfff0) >> 4;
-
-      infoShort = Utils.convertBytesToShort(std, 4);
-      _numUPX = infoShort & 0xf;
-
-      //first byte(s) of variable length section of std is the length of the
-      //style name and aliases string
-      int nameLength = 0;
-      int multiplier = 1;
-      if(word9)
-      {
-          nameLength = Utils.convertBytesToShort(std, baseLength);
-          multiplier = 2;
-      }
-      else
-      {
-          nameLength = std[baseLength];
-      }
-      //2 bytes for length, length then null terminator.
-      int grupxStart = multiplier + ((nameLength + 1) * multiplier) + baseLength;
-
-      int offset = 0;
-      for(int x = 0; x < _numUPX; x++)
-      {
-          int upxSize = Utils.convertBytesToShort(std, grupxStart + offset);
-          if(_styleTypeCode == PARAGRAPH_STYLE)
-          {
-              if(x == 0)
-              {
-                  _papx = new byte[upxSize];
-                  System.arraycopy(std, grupxStart + offset + 2, _papx, 0, upxSize);
-              }
-              else if(x == 1)
-              {
-                  _chpx = new byte[upxSize];
-                  System.arraycopy(std, grupxStart + offset + 2, _chpx, 0, upxSize);
-              }
-          }
-          else if(_styleTypeCode == CHARACTER_STYLE && x == 0)
-          {
-              _chpx = new byte[upxSize];
-              System.arraycopy(std, grupxStart + offset + 2, _chpx, 0, upxSize);
-          }
-
-          if((upxSize & 2) == 1)
-          {
-              ++upxSize;
-          }
-          offset += 2 + upxSize;
-      }
-
-
-
-  }
-  public int getBaseStyle()
-  {
-      return _baseStyleIndex;
-  }
-  public byte[] getCHPX()
-  {
-      return _chpx;
-  }
-  public byte[] getPAPX()
-  {
-      return _papx;
-  }
-  public PAP getPAP()
-  {
-      return _pap;
-  }
-  public CHP getCHP()
-  {
-      return _chp;
-  }
-  public void setPAP(PAP pap)
-  {
-      _pap = pap;
-  }
-  public void setCHP(CHP chp)
-  {
-      _chp = chp;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
deleted file mode 100644
index 3c1cfda4b5..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
+++ /dev/null
@@ -1,1285 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class StyleSheet {
-
-  private static final int NIL_STYLE = 4095;
-  private static final int PAP_TYPE = 1;
-  private static final int CHP_TYPE = 2;
-  private static final int SEP_TYPE = 4;
-  private static final int TAP_TYPE = 5;
-  //Vector _styleDescriptions;
-  StyleDescription _nilStyle = new StyleDescription();
-  StyleDescription[] _styleDescriptions;
-
-  public StyleSheet(byte[] styleSheet)
-  {
-      int stshiLength = Utils.convertBytesToShort(styleSheet, 0);
-      int stdCount = Utils.convertBytesToShort(styleSheet, 2);
-      int baseLength = Utils.convertBytesToShort(styleSheet, 4);
-      int[] rgftc = new int[3];
-
-      rgftc[0] = Utils.convertBytesToInt(styleSheet, 14);
-      rgftc[1] = Utils.convertBytesToInt(styleSheet, 18);
-      rgftc[2] = Utils.convertBytesToInt(styleSheet, 22);
-
-      int offset = 0;
-      _styleDescriptions = new StyleDescription[stdCount];
-      for(int x = 0; x < stdCount; x++)
-      {
-          int stdOffset = (2 + stshiLength) + offset;
-          int stdSize = Utils.convertBytesToShort(styleSheet, stdOffset);
-          if(stdSize > 0)
-          {
-              byte[] std = new byte[stdSize];
-
-              //get past the size
-              stdOffset += 2;
-              System.arraycopy(styleSheet, stdOffset, std, 0, stdSize);
-              StyleDescription aStyle = new StyleDescription(std, baseLength, true);
-
-              _styleDescriptions[x] = aStyle;
-          }
-
-
-          offset += stdSize + 2;
-
-      }
-      for(int x = 0; x < _styleDescriptions.length; x++)
-      {
-          if(_styleDescriptions[x] != null)
-          {
-              createPap(x);
-              createChp(x);
-          }
-      }
-  }
-  private void createPap(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      PAP pap = sd.getPAP();
-      byte[] papx = sd.getPAPX();
-      int baseIndex = sd.getBaseStyle();
-      if(pap == null && papx != null)
-      {
-          PAP parentPAP = _nilStyle.getPAP();
-          if(baseIndex != NIL_STYLE)
-          {
-
-              parentPAP = _styleDescriptions[baseIndex].getPAP();
-              if(parentPAP == null)
-              {
-                  createPap(baseIndex);
-                  parentPAP = _styleDescriptions[baseIndex].getPAP();
-              }
-
-          }
-
-          pap = (PAP)uncompressProperty(papx, parentPAP, this);
-          sd.setPAP(pap);
-      }
-  }
-  private void createChp(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      CHP chp = sd.getCHP();
-      byte[] chpx = sd.getCHPX();
-      int baseIndex = sd.getBaseStyle();
-      if(chp == null && chpx != null)
-      {
-          CHP parentCHP = _nilStyle.getCHP();
-          if(baseIndex != NIL_STYLE)
-          {
-
-              parentCHP = _styleDescriptions[baseIndex].getCHP();
-              if(parentCHP == null)
-              {
-                  createChp(baseIndex);
-                  parentCHP = _styleDescriptions[baseIndex].getCHP();
-              }
-
-          }
-
-          chp = (CHP)uncompressProperty(chpx, parentCHP, this);
-          sd.setCHP(chp);
-      }
-  }
-  public StyleDescription getStyleDescription(int x)
-  {
-      return _styleDescriptions[x];
-  }
-  static void doCHPOperation(CHP oldCHP, CHP newCHP, int operand, int param,
-                             byte[] varParam, byte[] grpprl, int offset,
-                             StyleSheet styleSheet)
-  {
-      switch(operand)
-      {
-          case 0:
-               newCHP._fRMarkDel = getFlag(param);
-               break;
-          case 0x1:
-               newCHP._fRMark = getFlag(param);
-               break;
-          case 0x2:
-               break;
-          case 0x3:
-               newCHP._fcPic = param;
-               newCHP._fSpec = true;
-               break;
-          case 0x4:
-               newCHP._ibstRMark = (short)param;
-               break;
-          case 0x5:
-               newCHP._dttmRMark[0] = Utils.convertBytesToShort(grpprl, (offset - 4));
-               newCHP._dttmRMark[1] = Utils.convertBytesToShort(grpprl, (offset - 2));
-               break;
-          case 0x6:
-               newCHP._fData = getFlag(param);
-               break;
-          case 0x7:
-               //don't care about this
-               break;
-          case 0x8:
-               short chsDiff = (short)((param & 0xff0000) >>> 8);
-               newCHP._fChsDiff = getFlag(chsDiff);
-               newCHP._chse = (short)(param & 0xffff);
-               break;
-          case 0x9:
-               newCHP._fSpec = true;
-               newCHP._ftcSym = Utils.convertBytesToShort(varParam, 0);
-               newCHP._xchSym = Utils.convertBytesToShort(varParam, 2);
-               break;
-          case 0xa:
-               newCHP._fOle2 = getFlag(param);
-               break;
-          case 0xb:
-               //?
-               break;
-          case 0xc:
-               newCHP._icoHighlight = (byte)param;
-               newCHP._highlighted = getFlag(param);
-               break;
-          case 0xd:
-               break;
-          case 0xe:
-               newCHP._fcObj = param;
-               break;
-          case 0xf:
-               break;
-          case 0x10:
-               //?
-               break;
-          case 0x11:
-               break;
-          case 0x12:
-               break;
-          case 0x13:
-               break;
-          case 0x14:
-               break;
-          case 0x15:
-               break;
-          case 0x16:
-               break;
-          case 0x17:
-               break;
-          case 0x18:
-               break;
-          case 0x19:
-               break;
-          case 0x1a:
-               break;
-          case 0x1b:
-               break;
-          case 0x1c:
-               break;
-          case 0x1d:
-               break;
-          case 0x1e:
-               break;
-          case 0x1f:
-               break;
-          case 0x20:
-               break;
-          case 0x21:
-               break;
-          case 0x22:
-               break;
-          case 0x23:
-               break;
-          case 0x24:
-               break;
-          case 0x25:
-               break;
-          case 0x26:
-               break;
-          case 0x27:
-               break;
-          case 0x28:
-               break;
-          case 0x29:
-               break;
-          case 0x2a:
-               break;
-          case 0x2b:
-               break;
-          case 0x2c:
-               break;
-          case 0x2d:
-               break;
-          case 0x2e:
-               break;
-          case 0x2f:
-               break;
-          case 0x30:
-               newCHP._istd = param;
-               break;
-          case 0x31:
-               //permutation vector for fast saves who cares!
-               break;
-          case 0x32:
-               newCHP._bold = false;
-               newCHP._italic = false;
-               newCHP._fOutline = false;
-               newCHP._fStrike = false;
-               newCHP._fShadow = false;
-               newCHP._fSmallCaps = false;
-               newCHP._fCaps = false;
-               newCHP._fVanish = false;
-               newCHP._kul = 0;
-               newCHP._ico = 0;
-               break;
-          case 0x33:
-               newCHP.copy(oldCHP);
-               return;
-          case 0x34:
-               break;
-          case 0x35:
-               newCHP._bold = getCHPFlag((byte)param, oldCHP._bold);
-               break;
-          case 0x36:
-               newCHP._italic = getCHPFlag((byte)param, oldCHP._italic);
-               break;
-          case 0x37:
-               newCHP._fStrike = getCHPFlag((byte)param, oldCHP._fStrike);
-               break;
-          case 0x38:
-               newCHP._fOutline = getCHPFlag((byte)param, oldCHP._fOutline);
-               break;
-          case 0x39:
-               newCHP._fShadow = getCHPFlag((byte)param, oldCHP._fShadow);
-               break;
-          case 0x3a:
-               newCHP._fSmallCaps = getCHPFlag((byte)param, oldCHP._fSmallCaps);
-               break;
-          case 0x3b:
-               newCHP._fCaps = getCHPFlag((byte)param, oldCHP._fCaps);
-               break;
-          case 0x3c:
-               newCHP._fVanish = getCHPFlag((byte)param, oldCHP._fVanish);
-               break;
-          case 0x3d:
-               newCHP._ftc = (short)param;
-               break;
-          case 0x3e:
-               newCHP._kul = (byte)param;
-               break;
-          case 0x3f:
-               int hps = param & 0xff;
-               if(hps != 0)
-               {
-                  newCHP._hps = hps;
-               }
-               byte cInc = (byte)(((byte)(param & 0xfe00) >>> 4) >> 1);
-               if(cInc != 0)
-               {
-                  newCHP._hps = Math.max(newCHP._hps + (cInc * 2), 2);
-               }
-               byte hpsPos = (byte)((param & 0xff0000) >>> 8);
-               if(hpsPos != 0x80)
-               {
-                  newCHP._hpsPos = hpsPos;
-               }
-               boolean fAdjust = (param & 0x0100) > 0;
-               if(fAdjust && hpsPos != 128 && hpsPos != 0 && oldCHP._hpsPos == 0)
-               {
-                  newCHP._hps = Math.max(newCHP._hps + (-2), 2);
-               }
-               if(fAdjust && hpsPos == 0 && oldCHP._hpsPos != 0)
-               {
-                  newCHP._hps = Math.max(newCHP._hps + 2, 2);
-               }
-               break;
-          case 0x40:
-               newCHP._dxaSpace = param;
-               break;
-          case 0x41:
-               newCHP._lidDefault = (short)param;
-               break;
-          case 0x42:
-               newCHP._ico = (byte)param;
-               break;
-          case 0x43:
-               newCHP._hps = param;
-               break;
-          case 0x44:
-               byte hpsLvl = (byte)param;
-               newCHP._hps = Math.max(newCHP._hps + (hpsLvl * 2), 2);
-               break;
-          case 0x45:
-               newCHP._hpsPos = (short)param;
-               break;
-          case 0x46:
-               if(param != 0)
-               {
-                  if(oldCHP._hpsPos == 0)
-                  {
-                      newCHP._hps = Math.max(newCHP._hps + (-2), 2);
-                  }
-               }
-               else
-               {
-                  if(oldCHP._hpsPos != 0)
-                  {
-                      newCHP._hps = Math.max(newCHP._hps + 2, 2);
-                  }
-               }
-               break;
-          case 0x47:
-               CHP genCHP = new CHP();
-               genCHP._ftc = 4;
-               genCHP = (CHP)uncompressProperty(varParam, genCHP, styleSheet);
-               CHP styleCHP = styleSheet.getStyleDescription(oldCHP._baseIstd).getCHP();
-               if(genCHP._bold == newCHP._bold)
-               {
-                  newCHP._bold = styleCHP._bold;
-               }
-               if(genCHP._italic == newCHP._italic)
-               {
-                  newCHP._italic = styleCHP._italic;
-               }
-               if(genCHP._fSmallCaps == newCHP._fSmallCaps)
-               {
-                  newCHP._fSmallCaps = styleCHP._fSmallCaps;
-               }
-               if(genCHP._fVanish == newCHP._fVanish)
-               {
-                  newCHP._fVanish = styleCHP._fVanish;
-               }
-               if(genCHP._fStrike == newCHP._fStrike)
-               {
-                  newCHP._fStrike = styleCHP._fStrike;
-               }
-               if(genCHP._fCaps == newCHP._fCaps)
-               {
-                  newCHP._fCaps = styleCHP._fCaps;
-               }
-               if(genCHP._ftcAscii == newCHP._ftcAscii)
-               {
-                  newCHP._ftcAscii = styleCHP._ftcAscii;
-               }
-               if(genCHP._ftcFE == newCHP._ftcFE)
-               {
-                  newCHP._ftcFE = styleCHP._ftcFE;
-               }
-               if(genCHP._ftcOther == newCHP._ftcOther)
-               {
-                  newCHP._ftcOther = styleCHP._ftcOther;
-               }
-               if(genCHP._hps == newCHP._hps)
-               {
-                  newCHP._hps = styleCHP._hps;
-               }
-               if(genCHP._hpsPos == newCHP._hpsPos)
-               {
-                  newCHP._hpsPos = styleCHP._hpsPos;
-               }
-               if(genCHP._kul == newCHP._kul)
-               {
-                  newCHP._kul = styleCHP._kul;
-               }
-               if(genCHP._dxaSpace == newCHP._dxaSpace)
-               {
-                  newCHP._dxaSpace = styleCHP._dxaSpace;
-               }
-               if(genCHP._ico == newCHP._ico)
-               {
-                  newCHP._ico = styleCHP._ico;
-               }
-               if(genCHP._lidDefault == newCHP._lidDefault)
-               {
-                  newCHP._lidDefault = styleCHP._lidDefault;
-               }
-               if(genCHP._lidFE == newCHP._lidFE)
-               {
-                  newCHP._lidFE = styleCHP._lidFE;
-               }
-               break;
-          case 0x48:
-               newCHP._iss = (byte)param;
-               break;
-          case 0x49:
-               newCHP._hps = Utils.convertBytesToShort(varParam, 0);
-               break;
-          case 0x4a:
-               int increment = Utils.convertBytesToShort(varParam, 0);
-               newCHP._hps = Math.max(newCHP._hps + increment, 8);
-               break;
-          case 0x4b:
-               newCHP._hpsKern = param;
-               break;
-          case 0x4c:
-               doCHPOperation(oldCHP, newCHP, 0x47, param, varParam, grpprl, offset, styleSheet);
-               break;
-          case 0x4d:
-               float percentage = param/100.0f;
-               int add = (int)(percentage * newCHP._hps);
-               newCHP._hps += add;
-               break;
-          case 0x4e:
-               newCHP._ysr = (byte)param;
-               break;
-          case 0x4f:
-               newCHP._ftcAscii = (short)param;
-               break;
-          case 0x50:
-               newCHP._ftcFE = (short)param;
-               break;
-          case 0x51:
-               newCHP._ftcOther = (short)param;
-               break;
-          case 0x52:
-               break;
-          case 0x53:
-               newCHP._fDStrike = getFlag(param);
-               break;
-          case 0x54:
-               newCHP._fImprint = getFlag(param);
-               break;
-          case 0x55:
-               newCHP._fSpec = getFlag(param);
-               break;
-          case 0x56:
-               newCHP._fObj = getFlag(param);
-               break;
-          case 0x57:
-               newCHP._fPropMark = getFlag(varParam[0]);
-               newCHP._ibstPropRMark = Utils.convertBytesToShort(varParam, 1);
-               newCHP._dttmPropRMark = Utils.convertBytesToInt(varParam, 3);
-               break;
-          case 0x58:
-               newCHP._fEmboss = getFlag(param);
-               break;
-          case 0x59:
-               newCHP._sfxtText = (byte)param;
-               break;
-          case 0x5a:
-               break;
-          case 0x5b:
-               break;
-          case 0x5c:
-               break;
-          case 0x5d:
-               break;
-          case 0x5e:
-               break;
-          case 0x5f:
-               break;
-          case 0x60:
-               break;
-          case 0x61:
-               break;
-          case 0x62:
-               newCHP._fDispFldRMark = getFlag(varParam[0]);
-               newCHP._ibstDispFldRMark = Utils.convertBytesToShort(varParam, 1);
-               newCHP._dttmDispFldRMark = Utils.convertBytesToInt(varParam, 3);
-               System.arraycopy(varParam, 7, newCHP._xstDispFldRMark, 0, 32);
-               break;
-          case 0x63:
-               newCHP._ibstRMarkDel = (short)param;
-               break;
-          case 0x64:
-               newCHP._dttmRMarkDel[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newCHP._dttmRMarkDel[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x65:
-               newCHP._brc[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newCHP._brc[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x66:
-               newCHP._shd = (short)param;
-               break;
-          case 0x67:
-               break;
-          case 0x68:
-               break;
-          case 0x69:
-               break;
-          case 0x6a:
-               break;
-          case 0x6b:
-               break;
-          case 0x6c:
-               break;
-          case 0x6d:
-               newCHP._lidDefault = (short)param;
-               break;
-          case 0x6e:
-               newCHP._lidFE = (short)param;
-               break;
-          case 0x6f:
-               newCHP._idctHint = (byte)param;
-               break;
-      }
-  }
-
-  static Object uncompressProperty(byte[] grpprl, Object parent, StyleSheet styleSheet)
-  {
-    return uncompressProperty(grpprl, parent, styleSheet, true);
-  }
-
-
-  static Object uncompressProperty(byte[] grpprl, Object parent, StyleSheet styleSheet, boolean doIstd)
-  {
-      Object newProperty = null;
-      int offset = 0;
-      int propertyType = PAP_TYPE;
-
-
-      if(parent instanceof PAP)
-      {
-          try
-          {
-              newProperty = ((PAP)parent).clone();
-          }
-          catch(Exception e){}
-          if(doIstd)
-          {
-            ((PAP)newProperty)._istd = Utils.convertBytesToShort(grpprl, 0);
-
-            offset = 2;
-          }
-      }
-      else if(parent instanceof CHP)
-      {
-          try
-          {
-              newProperty = ((CHP)parent).clone();
-              ((CHP)newProperty)._baseIstd = ((CHP)parent)._istd;
-          }
-          catch(Exception e){}
-          propertyType = CHP_TYPE;
-      }
-      else if(parent instanceof SEP)
-      {
-          newProperty = parent;
-          propertyType = SEP_TYPE;
-      }
-      else if(parent instanceof TAP)
-      {
-          newProperty = parent;
-          propertyType = TAP_TYPE;
-          offset = 2;//because this is really just a papx
-      }
-      else
-      {
-          return null;
-      }
-
-      while(offset < grpprl.length)
-      {
-          short sprm = Utils.convertBytesToShort(grpprl, offset);
-          offset += 2;
-
-          byte spra = (byte)((sprm & 0xe000) >> 13);
-          int opSize = 0;
-          int param = 0;
-          byte[] varParam = null;
-
-          switch(spra)
-          {
-              case 0:
-              case 1:
-                   opSize = 1;
-                   param = grpprl[offset];
-                   break;
-              case 2:
-                   opSize = 2;
-                   param = Utils.convertBytesToShort(grpprl, offset);
-                   break;
-              case 3:
-                   opSize = 4;
-                   param = Utils.convertBytesToInt(grpprl, offset);
-                   break;
-              case 4:
-              case 5:
-                   opSize = 2;
-                   param = Utils.convertBytesToShort(grpprl, offset);
-                   break;
-              case 6://variable size
-
-                   //there is one sprm that is a very special case
-                   if(sprm != (short)0xd608)
-                   {
-                     opSize = Utils.convertUnsignedByteToInt(grpprl[offset]);
-                     offset++;
-                   }
-                   else
-                   {
-                     opSize = Utils.convertBytesToShort(grpprl, offset) - 1;
-                     offset += 2;
-                   }
-                   varParam = new byte[opSize];
-                   System.arraycopy(grpprl, offset, varParam, 0, opSize);
-
-                   break;
-              case 7:
-                   opSize = 3;
-                   param = Utils.convertBytesToInt((byte)0, grpprl[offset + 2], grpprl[offset + 1], grpprl[offset]);
-                   break;
-              default:
-                  throw new RuntimeException("unrecognized pap opcode");
-          }
-
-          offset += opSize;
-          short operand = (short)(sprm & 0x1ff);
-          byte type = (byte)((sprm & 0x1c00) >> 10);
-          switch(propertyType)
-          {
-              case PAP_TYPE:
-                   if(type == 1)//papx stores TAP sprms along with PAP sprms
-                   {
-                     doPAPOperation((PAP)newProperty, operand, param, varParam, grpprl,
-                                    offset, spra);
-                   }
-                   break;
-              case CHP_TYPE:
-
-                   doCHPOperation((CHP)parent, (CHP)newProperty, operand, param, varParam,
-                                  grpprl, offset, styleSheet);
-                   break;
-              case SEP_TYPE:
-
-                   doSEPOperation((SEP)newProperty, operand, param, varParam);
-                   break;
-              case TAP_TYPE:
-                   if(type == 5)
-                   {
-                     doTAPOperation((TAP)newProperty, operand, param, varParam);
-                   }
-                   break;
-          }
-
-
-      }
-      return newProperty;
-
-  }
-  static void doPAPOperation(PAP newPAP, int operand, int param,
-                             byte[] varParam, byte[] grpprl, int offset,
-                             int spra)
-  {
-      switch(operand)
-      {
-          case 0:
-               newPAP._istd = param;
-               break;
-          case 0x1:
-               //permuteIstd(newPAP, varParam);
-               break;
-          case 0x2:
-               if(newPAP._istd <=9 || newPAP._istd >=1)
-               {
-                  newPAP._istd += param;
-                  if(param > 0)
-                  {
-                      newPAP._istd = Math.max(newPAP._istd, 9);
-                  }
-                  else
-                  {
-                      newPAP._istd = Math.min(newPAP._istd, 1);
-                  }
-               }
-               break;
-          case 0x3:
-               newPAP._jc = (byte)param;
-               break;
-          case 0x4:
-               newPAP._fSideBySide = (byte)param;
-               break;
-          case 0x5:
-               newPAP._fKeep = (byte)param;
-               break;
-          case 0x6:
-               newPAP._fKeepFollow = (byte)param;
-               break;
-          case 0x7:
-               newPAP._fPageBreakBefore = (byte)param;
-               break;
-          case 0x8:
-               newPAP._brcl = (byte)param;
-               break;
-          case 0x9:
-               newPAP._brcp = (byte)param;
-               break;
-          case 0xa:
-               newPAP._ilvl = (byte)param;
-               break;
-          case 0xb:
-               newPAP._ilfo = param;
-               break;
-          case 0xc:
-               newPAP._fNoLnn = (byte)param;
-               break;
-          case 0xd:
-               /**@todo handle tabs*/
-               break;
-          case 0xe:
-               newPAP._dxaRight = param;
-               break;
-          case 0xf:
-               newPAP._dxaLeft = param;
-               break;
-          case 0x10:
-               newPAP._dxaLeft += param;
-               newPAP._dxaLeft = Math.max(0, newPAP._dxaLeft);
-               break;
-          case 0x11:
-               newPAP._dxaLeft1 = param;
-               break;
-          case 0x12:
-               newPAP._lspd[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._lspd[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x13:
-               newPAP._dyaBefore = param;
-               break;
-          case 0x14:
-               newPAP._dyaAfter = param;
-               break;
-          case 0x15:
-               /**@todo handle tabs*/
-               break;
-          case 0x16:
-               newPAP._fInTable = (byte)param;
-               break;
-          case 0x17:
-               newPAP._fTtp =(byte)param;
-               break;
-          case 0x18:
-               newPAP._dxaAbs = param;
-               break;
-          case 0x19:
-               newPAP._dyaAbs = param;
-               break;
-          case 0x1a:
-               newPAP._dxaWidth = param;
-               break;
-          case 0x1b:
-               /** @todo handle paragraph postioning*/
-               /*byte pcVert = (param & 0x0c) >> 2;
-               byte pcHorz = param & 0x03;
-               if(pcVert != 3)
-               {
-                  newPAP._pcVert = pcVert;
-               }
-               if(pcHorz != 3)
-               {
-                  newPAP._pcHorz = pcHorz;
-               }*/
-               break;
-          case 0x1c:
-               newPAP._brcTop1 = (short)param;
-               break;
-          case 0x1d:
-               newPAP._brcLeft1 = (short)param;
-               break;
-          case 0x1e:
-               newPAP._brcBottom1 = (short)param;
-               break;
-          case 0x1f:
-               newPAP._brcRight1 = (short)param;
-               break;
-          case 0x20:
-               newPAP._brcBetween1 = (short)param;
-               break;
-          case 0x21:
-               newPAP._brcBar1 = (byte)param;
-               break;
-          case 0x22:
-               newPAP._dxaFromText = param;
-               break;
-          case 0x23:
-               newPAP._wr = (byte)param;
-               break;
-          case 0x24:
-               newPAP._brcTop[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcTop[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x25:
-               newPAP._brcLeft[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcLeft[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x26:
-               newPAP._brcBottom[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcBottom[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x27:
-               newPAP._brcRight[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcRight[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x28:
-               newPAP._brcBetween[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcBetween[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x29:
-               newPAP._brcBar[0] = Utils.convertBytesToShort(grpprl, offset - 4);
-               newPAP._brcBar[1] = Utils.convertBytesToShort(grpprl, offset - 2);
-               break;
-          case 0x2a:
-               newPAP._fNoAutoHyph = (byte)param;
-               break;
-          case 0x2b:
-               newPAP._dyaHeight = param;
-               break;
-          case 0x2c:
-               newPAP._dcs = param;
-               break;
-          case 0x2d:
-               newPAP._shd = param;
-               break;
-          case 0x2e:
-               newPAP._dyaFromText = param;
-               break;
-          case 0x2f:
-               newPAP._dxaFromText = param;
-               break;
-          case 0x30:
-               newPAP._fLocked = (byte)param;
-               break;
-          case 0x31:
-               newPAP._fWindowControl = (byte)param;
-               break;
-          case 0x32:
-               //undocumented
-               break;
-          case 0x33:
-               newPAP._fKinsoku = (byte)param;
-               break;
-          case 0x34:
-               newPAP._fWordWrap = (byte)param;
-               break;
-          case 0x35:
-               newPAP._fOverflowPunct = (byte)param;
-               break;
-          case 0x36:
-               newPAP._fTopLinePunct = (byte)param;
-               break;
-          case 0x37:
-               newPAP._fAutoSpaceDE = (byte)param;
-               break;
-          case 0x38:
-               newPAP._fAutoSpaceDN = (byte)param;
-               break;
-          case 0x39:
-               newPAP._wAlignFont = param;
-               break;
-          case 0x3a:
-               newPAP._fontAlign = (short)param;
-               break;
-          case 0x3b:
-               //obsolete
-               break;
-          case 0x3e:
-               newPAP._anld = varParam;
-               break;
-          case 0x3f:
-               //don't really need this. spec is confusing regarding this
-               //sprm
-               break;
-          case 0x40:
-               //newPAP._lvl = param;
-               break;
-          case 0x41:
-               //?
-               break;
-          case 0x43:
-               //?
-              break;
-          case 0x44:
-               //?
-               break;
-          case 0x45:
-               if(spra == 6)
-               {
-                  newPAP._numrm = varParam;
-               }
-               else
-               {
-                  /**@todo handle large PAPX from data stream*/
-               }
-               break;
-
-          case 0x47:
-               newPAP._fUsePgsuSettings = (byte)param;
-               break;
-          case 0x48:
-               newPAP._fAdjustRight = (byte)param;
-               break;
-          default:
-               break;
-      }
-  }
-  static void doTAPOperation(TAP newTAP, int operand, int param, byte[] varParam)
-  {
-      switch(operand)
-      {
-          case 0:
-               newTAP._jc = (short)param;
-               break;
-          case 0x01:
-          {
-               int adjust = param - (newTAP._rgdxaCenter[0] + newTAP._dxaGapHalf);
-               for(int x = 0; x < newTAP._itcMac; x++)
-               {
-                  newTAP._rgdxaCenter[x] += adjust;
-               }
-               break;
-          }
-          case 0x02:
-               if(newTAP._rgdxaCenter != null)
-               {
-                 int adjust = newTAP._dxaGapHalf - param;
-                 newTAP._rgdxaCenter[0] += adjust;
-               }
-               newTAP._dxaGapHalf = param;
-               break;
-          case 0x03:
-               newTAP._fCantSplit = getFlag(param);
-               break;
-          case 0x04:
-               newTAP._fTableHeader = getFlag(param);
-               break;
-          case 0x05:
-
-               newTAP._brcTop[0] = Utils.convertBytesToShort(varParam, 0);
-               newTAP._brcTop[1] = Utils.convertBytesToShort(varParam, 2);
-
-               newTAP._brcLeft[0] = Utils.convertBytesToShort(varParam, 4);
-               newTAP._brcLeft[1] = Utils.convertBytesToShort(varParam, 6);
-
-               newTAP._brcBottom[0] = Utils.convertBytesToShort(varParam, 8);
-               newTAP._brcBottom[1] = Utils.convertBytesToShort(varParam, 10);
-
-               newTAP._brcRight[0] = Utils.convertBytesToShort(varParam, 12);
-               newTAP._brcRight[1] = Utils.convertBytesToShort(varParam, 14);
-
-               newTAP._brcHorizontal[0] = Utils.convertBytesToShort(varParam, 16);
-               newTAP._brcHorizontal[1] = Utils.convertBytesToShort(varParam, 18);
-
-               newTAP._brcVertical[0] = Utils.convertBytesToShort(varParam, 20);
-               newTAP._brcVertical[1] = Utils.convertBytesToShort(varParam, 22);
-               break;
-          case 0x06:
-               //obsolete, used in word 1.x
-               break;
-          case 0x07:
-               newTAP._dyaRowHeight = param;
-               break;
-          case 0x08:
-               //I use varParam[0] and newTAP._itcMac interchangably
-               newTAP._itcMac = varParam[0];
-               newTAP._rgdxaCenter = new short[varParam[0] + 1];
-               newTAP._rgtc = new TC[varParam[0]];
-
-               for(int x = 0; x < newTAP._itcMac; x++)
-               {
-                 newTAP._rgdxaCenter[x] = Utils.convertBytesToShort(varParam , 1 + (x * 2));
-                 newTAP._rgtc[x] = TC.convertBytesToTC(varParam, 1 + ((varParam[0] + 1) * 2) + (x * 20));
-               }
-               newTAP._rgdxaCenter[newTAP._itcMac] = Utils.convertBytesToShort(varParam , 1 + (newTAP._itcMac * 2));
-               break;
-          case 0x09:
-               /** @todo handle cell shading*/
-               break;
-          case 0x0a:
-               /** @todo handle word defined table styles*/
-               break;
-          case 0x20:
-               for(int x = varParam[0]; x < varParam[1]; x++)
-               {
-                 if((varParam[2] & 0x08) > 0)
-                 {
-                   newTAP._rgtc[x]._brcRight[0] = Utils.convertBytesToShort(varParam, 6);
-                   newTAP._rgtc[x]._brcRight[1] = Utils.convertBytesToShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x04) > 0)
-                 {
-                   newTAP._rgtc[x]._brcBottom[0] = Utils.convertBytesToShort(varParam, 6);
-                   newTAP._rgtc[x]._brcBottom[1] = Utils.convertBytesToShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x02) > 0)
-                 {
-                   newTAP._rgtc[x]._brcLeft[0] = Utils.convertBytesToShort(varParam, 6);
-                   newTAP._rgtc[x]._brcLeft[1] = Utils.convertBytesToShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x01) > 0)
-                 {
-                   newTAP._rgtc[x]._brcTop[0] = Utils.convertBytesToShort(varParam, 6);
-                   newTAP._rgtc[x]._brcTop[1] = Utils.convertBytesToShort(varParam, 8);
-                 }
-               }
-               break;
-          case 0x21:
-               int index = (param & 0xff000000) >> 24;
-               int count = (param & 0x00ff0000) >> 16;
-               int width = (param & 0x0000ffff);
-
-               short[] rgdxaCenter = new short[newTAP._itcMac + count + 1];
-               TC[] rgtc = new TC[newTAP._itcMac + count];
-               if(index >= newTAP._itcMac)
-               {
-                 index = newTAP._itcMac;
-                 System.arraycopy(newTAP._rgdxaCenter, 0, rgdxaCenter, 0, newTAP._itcMac + 1);
-                 System.arraycopy(newTAP._rgtc, 0, rgtc, 0, newTAP._itcMac);
-               }
-               else
-               {
-                 //copy rgdxaCenter
-                 System.arraycopy(newTAP._rgdxaCenter, 0, rgdxaCenter, 0, index + 1);
-                 System.arraycopy(newTAP._rgdxaCenter, index + 1, rgdxaCenter, index + count, (newTAP._itcMac) - (index));
-                 //copy rgtc
-                 System.arraycopy(newTAP._rgtc, 0, rgtc, 0, index);
-                 System.arraycopy(newTAP._rgtc, index, rgtc, index + count, newTAP._itcMac - index);
-               }
-
-               for(int x = index; x < index + count; x++)
-               {
-                 rgtc[x] = new TC();
-                 rgdxaCenter[x] = (short)(rgdxaCenter[x-1] + width);
-               }
-               rgdxaCenter[index + count] = (short)(rgdxaCenter[(index + count)-1] + width);
-               break;
-          /**@todo handle table sprms from complex files*/
-          case 0x22:
-          case 0x23:
-          case 0x24:
-          case 0x25:
-          case 0x26:
-          case 0x27:
-          case 0x28:
-          case 0x29:
-          case 0x2a:
-          case 0x2b:
-          case 0x2c:
-               break;
-          default:
-               break;
-      }
-  }
-  static void doSEPOperation(SEP newSEP, int operand, int param, byte[] varParam)
-  {
-      switch(operand)
-      {
-          case 0:
-               newSEP._cnsPgn = (byte)param;
-               break;
-          case 0x1:
-               newSEP._iHeadingPgn = (byte)param;
-               break;
-          case 0x2:
-               newSEP._olstAnn = varParam;
-               break;
-          case 0x3:
-               //not quite sure
-               break;
-          case 0x4:
-               //not quite sure
-               break;
-          case 0x5:
-               newSEP._fEvenlySpaced = getFlag(param);
-               break;
-          case 0x6:
-               newSEP._fUnlocked = getFlag(param);
-               break;
-          case 0x7:
-               newSEP._dmBinFirst = (short)param;
-               break;
-          case 0x8:
-               newSEP._dmBinOther = (short)param;
-               break;
-          case 0x9:
-               newSEP._bkc = (byte)param;
-               break;
-          case 0xa:
-               newSEP._fTitlePage = getFlag(param);
-               break;
-          case 0xb:
-               newSEP._ccolM1 = (short)param;
-               break;
-          case 0xc:
-               newSEP._dxaColumns = param;
-               break;
-          case 0xd:
-               newSEP._fAutoPgn = getFlag(param);
-               break;
-          case 0xe:
-               newSEP._nfcPgn = (byte)param;
-               break;
-          case 0xf:
-               newSEP._dyaPgn = (short)param;
-               break;
-          case 0x10:
-               newSEP._dxaPgn = (short)param;
-               break;
-          case 0x11:
-               newSEP._fPgnRestart = getFlag(param);
-               break;
-          case 0x12:
-               newSEP._fEndNote = getFlag(param);
-               break;
-          case 0x13:
-               newSEP._lnc = (byte)param;
-               break;
-          case 0x14:
-               newSEP._grpfIhdt = (byte)param;
-               break;
-          case 0x15:
-               newSEP._nLnnMod = (short)param;
-               break;
-          case 0x16:
-               newSEP._dxaLnn = param;
-               break;
-          case 0x17:
-               newSEP._dyaHdrTop = param;
-               break;
-          case 0x18:
-               newSEP._dyaHdrBottom = param;
-               break;
-          case 0x19:
-               newSEP._fLBetween = getFlag(param);
-               break;
-          case 0x1a:
-               newSEP._vjc = (byte)param;
-               break;
-          case 0x1b:
-               newSEP._lnnMin = (short)param;
-               break;
-          case 0x1c:
-               newSEP._pgnStart = (short)param;
-               break;
-          case 0x1d:
-               newSEP._dmOrientPage = (byte)param;
-               break;
-          case 0x1e:
-               //nothing
-               break;
-          case 0x1f:
-               newSEP._xaPage = param;
-               break;
-          case 0x20:
-               newSEP._yaPage = param;
-               break;
-          case 0x21:
-               newSEP._dxaLeft = param;
-               break;
-          case 0x22:
-               newSEP._dxaRight = param;
-               break;
-          case 0x23:
-               newSEP._dyaTop = param;
-               break;
-          case 0x24:
-               newSEP._dyaBottom = param;
-               break;
-          case 0x25:
-               newSEP._dzaGutter = param;
-               break;
-          case 0x26:
-               newSEP._dmPaperReq = (short)param;
-               break;
-          case 0x27:
-               newSEP._fPropMark = getFlag(varParam[0]);
-               break;
-          case 0x28:
-               break;
-          case 0x29:
-               break;
-          case 0x2a:
-               break;
-          case 0x2b:
-               newSEP._brcTop[0] = (short)(param & 0xffff);
-               newSEP._brcTop[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2c:
-               newSEP._brcLeft[0] = (short)(param & 0xffff);
-               newSEP._brcLeft[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2d:
-               newSEP._brcBottom[0] = (short)(param & 0xffff);
-               newSEP._brcBottom[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2e:
-               newSEP._brcRight[0] = (short)(param & 0xffff);
-               newSEP._brcRight[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2f:
-               newSEP._pgbProp = (short)param;
-               break;
-          case 0x30:
-               newSEP._dxtCharSpace = param;
-               break;
-          case 0x31:
-               newSEP._dyaLinePitch = param;
-               break;
-          case 0x33:
-               newSEP._wTextFlow = (short)param;
-               break;
-          default:
-               break;
-      }
-
-  }
-  private static boolean getCHPFlag(byte x, boolean oldVal)
-  {
-      switch(x)
-      {
-          case 0:
-               return false;
-          case 1:
-               return true;
-          case (byte)0x80:
-               return oldVal;
-          case (byte)0x81:
-               return !oldVal;
-          default:
-               return false;
-      }
-  }
-  public static boolean getFlag(int x)
-  {
-      return x != 0;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
deleted file mode 100644
index d28980637e..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TAP
-{
-  short _jc;
-  int _dxaGapHalf;
-  int _dyaRowHeight;
-  boolean _fCantSplit;
-  boolean _fTableHeader;
-  boolean _fLastRow;
-  short _itcMac;
-  short[] _rgdxaCenter;
-  short[] _brcLeft = new short[2];
-  short[] _brcRight = new short[2];
-  short[] _brcTop = new short[2];
-  short[] _brcBottom = new short[2];
-  short[] _brcHorizontal = new short[2];
-  short[] _brcVertical = new short[2];
-
-  TC[] _rgtc;
-
-
-  public TAP()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
deleted file mode 100644
index 54dcdf575b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TC
-{
-
-  boolean _fFirstMerged;
-  boolean _fMerged;
-  boolean _fVertical;
-  boolean _fBackward;
-  boolean _fRotateFont;
-  boolean _fVertMerge;
-  boolean _fVertRestart;
-  short _vertAlign;
-  short[] _brcTop = new short[2];
-  short[] _brcLeft = new short[2];
-  short[] _brcBottom = new short[2];
-  short[] _brcRight = new short [2];
-
-  public TC()
-  {
-  }
-  static TC convertBytesToTC(byte[] array, int offset)
-  {
-    TC tc = new TC();
-    int rgf = Utils.convertBytesToShort(array, offset);
-    tc._fFirstMerged = (rgf & 0x0001) > 0;
-    tc._fMerged = (rgf & 0x0002) > 0;
-    tc._fVertical = (rgf & 0x0004) > 0;
-    tc._fBackward = (rgf & 0x0008) > 0;
-    tc._fRotateFont = (rgf & 0x0010) > 0;
-    tc._fVertMerge = (rgf & 0x0020) > 0;
-    tc._fVertRestart = (rgf & 0x0040) > 0;
-    tc._vertAlign = (short)((rgf & 0x0180) >> 7);
-
-    tc._brcTop[0] = Utils.convertBytesToShort(array, offset + 4);
-    tc._brcTop[1] = Utils.convertBytesToShort(array, offset + 6);
-
-    tc._brcLeft[0] = Utils.convertBytesToShort(array, offset + 8);
-    tc._brcLeft[1] = Utils.convertBytesToShort(array, offset + 10);
-
-    tc._brcBottom[0] = Utils.convertBytesToShort(array, offset + 12);
-    tc._brcBottom[1] = Utils.convertBytesToShort(array, offset + 14);
-
-    tc._brcRight[0] = Utils.convertBytesToShort(array, offset + 16);
-    tc._brcRight[1] = Utils.convertBytesToShort(array, offset + 18);
-
-    return tc;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
deleted file mode 100644
index f020fa7269..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-import java.util.ArrayList;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TableRow
-{
-  TAP _descriptor;
-  ArrayList<String> _cells;
-
-  public TableRow(ArrayList<String> cells, TAP descriptor)
-  {
-    _cells = cells;
-    _descriptor = descriptor;
-  }
-  public TAP getTAP()
-  {
-    return _descriptor;
-  }
-  public ArrayList<String> getCells()
-  {
-    return _cells;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
deleted file mode 100644
index 059b467a36..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-import org.apache.poi.hdf.extractor.util.*;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TextPiece extends PropertyNode implements Comparable
-{
-  private boolean _usesUnicode;
-  private int _length;
-
-  public TextPiece(int start, int length, boolean unicode)
-  {
-    super(start, start + length, null);
-      _usesUnicode = unicode;
-      _length = length;
-      //_fcStart = start;
-      //_fcEnd = start + length;
-
-  }
-   public boolean usesUnicode()
-  {
-      return _usesUnicode;
-  }
-
-   public int compareTo(Object obj) {
-       return 0;
-   }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
deleted file mode 100644
index 6caf73b0c0..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class Utils
-{
-
-    public static short convertBytesToShort(byte firstByte, byte secondByte)
-    {
-        return (short)convertBytesToInt((byte)0, (byte)0, firstByte, secondByte);
-    }
-    public static int convertBytesToInt(byte firstByte, byte secondByte,
-                                  byte thirdByte, byte fourthByte)
-    {
-        int firstInt = 0xff & firstByte;
-        int secondInt = 0xff & secondByte;
-        int thirdInt = 0xff & thirdByte;
-        int fourthInt = 0xff & fourthByte;
-
-        return (firstInt << 24) | (secondInt << 16) | (thirdInt << 8) | fourthInt;
-    }
-    public static short convertBytesToShort(byte[] array, int offset)
-    {
-        return convertBytesToShort(array[offset + 1], array[offset]);
-    }
-    public static int convertBytesToInt(byte[] array, int offset)
-    {
-        return convertBytesToInt(array[offset + 3], array[offset + 2], array[offset + 1], array[offset]);
-    }
-    public static int convertUnsignedByteToInt(byte b)
-    {
-        return (0xff & b);
-    }
-    public static char getUnicodeCharacter(byte[] array, int offset)
-    {
-      return (char)convertBytesToShort(array, offset);
-    }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
deleted file mode 100644
index 62445f8522..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
+++ /dev/null
@@ -1,1835 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-
-import org.apache.poi.hdf.extractor.data.DOP;
-import org.apache.poi.hdf.extractor.data.LVL;
-import org.apache.poi.hdf.extractor.data.ListTables;
-import org.apache.poi.hdf.extractor.util.BTreeSet;
-import org.apache.poi.hdf.extractor.util.ChpxNode;
-import org.apache.poi.hdf.extractor.util.NumberFormatter;
-import org.apache.poi.hdf.extractor.util.PapxNode;
-import org.apache.poi.hdf.extractor.util.PropertyNode;
-import org.apache.poi.hdf.extractor.util.SepxNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class contains the main functionality for the Word file "reader". Much
- * of the code in this class is based on the Word 97 document file format. Only
- * works for non-complex files
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class WordDocument {
-	// TODO - name this constant properly
-	private static final float K_1440_0F = 1440.0f;
-/** byte buffer containing the main Document stream*/
-  byte[] _header;
-  /** contains all style information for this document see Word 97 Doc spec*/
-  StyleSheet _styleSheet;
-  /** contains All list information for this document*/
-  ListTables _listTables;
-  /** contains global Document properties for this document*/
-  DOP _docProps = new DOP();
-
-  int _currentList = -1;
-  int _tableSize;
-  int _sectionCounter = 1;
-  /** fonts available for this document*/
-  FontTable _fonts;
-
-  /** document's text blocks*/
-  BTreeSet _text = new BTreeSet();
-  /** document's character runs */
-  BTreeSet _characterTable = new BTreeSet();
-  /** document's paragraphs*/
-  BTreeSet _paragraphTable = new BTreeSet();
-  /** doucment's sections*/
-  BTreeSet _sectionTable = new BTreeSet();
-
-  /** used for XSL-FO conversion*/
-  StringBuffer _headerBuffer = new StringBuffer();
-  /** used for XSL-FO conversion*/
-  StringBuffer _bodyBuffer = new StringBuffer();
-  /** used for XSL-FO table conversion*/
-  StringBuffer _cellBuffer;
-  /** used for XSL-FO table conversion*/
-  ArrayList<String> _cells;
-  /** used for XSL-FO table conversion*/
-  ArrayList<TableRow> _table;
-
-  /** document's header and footer information*/
-  byte[] _plcfHdd;
-
-  /** starting position of text in main document stream*/
-  int _fcMin;
-  /** length of main document text stream*/
-  int _ccpText;
-  /** length of footnotes text*/
-  int _ccpFtn;
-
-  /** The name of the file to write to */
-  private static String _outName;
-
-  /** OLE stuff*/
-  private InputStream istream;
-  /** OLE stuff*/
-  private POIFSFileSystem filesystem;
-
-  //used internally
-  private static int HEADER_EVEN_INDEX = 0;
-  private static int HEADER_ODD_INDEX = 1;
-  private static int FOOTER_EVEN_INDEX = 2;
-  private static int FOOTER_ODD_INDEX = 3;
-  private static int HEADER_FIRST_INDEX = 4;
-  private static int FOOTER_FIRST_INDEX = 5;
-
-  /**
-   *  right now this function takes one parameter: a Word file, and outputs an
-   *  XSL-FO document at c:\test.xml (this is hardcoded)
-   *  
-   *  @param args The document to read
-   */
-  public static void main(String args[])
-  {
-      /*try
-      {
-        WordDocument file = new WordDocument(args[0], "r");
-        Writer out = new BufferedWriter(new FileWriter(args[1]));
-        file.writeAllText(out);
-        out.flush();
-        out.close();
-      }
-      catch(Throwable t)
-      {
-        t.printStackTrace();
-      }*/
-      try
-      {
-          _outName = args[1];
-          WordDocument file = new WordDocument(args[0]);
-          file.closeDoc();
-      }
-      catch(Exception e)
-      {
-          e.printStackTrace();
-      }
-  }
-
-  /**
-   * Spits out the document text
-   *
-   * @param out The Writer to write the text to.
-   * @throws IOException if there is a problem while reading from the file or
-   *         writing out the text.
-   */
-  public void writeAllText(Writer out) throws IOException
-  {
-    int textStart = Utils.convertBytesToInt(_header, 0x18);
-    int textEnd = Utils.convertBytesToInt(_header, 0x1c);
-    ArrayList<PropertyNode> textPieces = findProperties(textStart, textEnd, _text.root);
-    int size = textPieces.size();
-
-    for(int x = 0; x < size; x++)
-    {
-      TextPiece nextPiece = (TextPiece)textPieces.get(x);
-      int start = nextPiece.getStart();
-      int end = nextPiece.getEnd();
-      boolean unicode = nextPiece.usesUnicode();
-      int add = 1;
-
-      if(unicode)
-      {
-        add = 2;
-        char ch;
-        for(int y = start; y < end; y += add)
-        {
-	  ch = (char)Utils.convertBytesToShort(_header, y);
-	  out.write(ch);
-        }
-      }
-      else
-      {
-	String sText = new String(_header, start, end-start, "windows-1252");
-	out.write(sText);
-      }
-    }
-  }
-  /**
-   * Constructs a Word document from fileName. Parses the document and places
-   * all the important stuff into data structures.
-   *
-   * @param fileName The name of the file to read.
-   * @throws IOException if there is a problem while parsing the document.
-   */
-  public WordDocument(String fileName) throws IOException
-  {
-  	this(new FileInputStream(fileName));
-  }
-
-  public WordDocument(InputStream inputStream) throws IOException
-  {
-        //do Ole stuff
-        istream = inputStream;
-        filesystem = new POIFSFileSystem(istream);
-
-        //get important stuff from the Header block and parse all the
-        //data structures
-        readFIB();
-
-        //get the SEPS for the main document text
-        ArrayList<PropertyNode> sections = findProperties(_fcMin, _fcMin + _ccpText, _sectionTable.root);
-
-        //iterate through sections, paragraphs, and character runs doing what
-        //you will with the data.
-        int size = sections.size();
-        for(int x = 0; x < size; x++)
-        {
-          SepxNode node = (SepxNode)sections.get(x);
-          int start = node.getStart();
-          int end = node.getEnd();
-          SEP sep = (SEP)StyleSheet.uncompressProperty(node.getSepx(), new SEP(), _styleSheet);
-          writeSection(Math.max(_fcMin, start), Math.min(_fcMin + _ccpText, end), sep, _text, _paragraphTable, _characterTable, _styleSheet);
-        }
-        //finish
-        istream.close();
-
-  }
-  /**
-   * Extracts the main document stream from the POI file then hands off to other
-   * functions that parse other areas.
-   *
-   * @throws IOException
-   */
-  private void readFIB() throws IOException
-  {
-      //get the main document stream
-      DocumentEntry headerProps =
-        (DocumentEntry)filesystem.getRoot().getEntry("WordDocument");
-
-      //I call it the header but its also the main document stream
-      _header = new byte[headerProps.getSize()];
-      filesystem.createDocumentInputStream("WordDocument").read(_header);
-
-      //Get the information we need from the header
-      int info = LittleEndian.getShort(_header, 0xa);
-
-      _fcMin = LittleEndian.getInt(_header, 0x18);
-      _ccpText = LittleEndian.getInt(_header, 0x4c);
-      _ccpFtn = LittleEndian.getInt(_header, 0x50);
-
-      int charPLC = LittleEndian.getInt(_header, 0xfa);
-      int charPlcSize = LittleEndian.getInt(_header, 0xfe);
-      int parPLC = LittleEndian.getInt(_header, 0x102);
-      int parPlcSize = LittleEndian.getInt(_header, 0x106);
-      boolean useTable1 = (info & 0x200) != 0;
-
-      //process the text and formatting properties
-      processComplexFile(useTable1, charPLC, charPlcSize, parPLC, parPlcSize);
-  }
-
-  /**
-   * Extracts the correct Table stream from the POI filesystem then hands off to
-   * other functions to process text and formatting info. the name is based on
-   * the fact that in Word 8(97) all text (not character or paragraph formatting)
-   * is stored in complex format.
-   *
-   * @param useTable1 boolean that specifies if we should use table1 or table0
-   * @param charTable offset in table stream of character property bin table
-   * @param charPlcSize size of character property bin table
-   * @param parTable offset in table stream of paragraph property bin table.
-   * @param parPlcSize size of paragraph property bin table.
-   * @return boolean indocating success of
-   * @throws IOException
-   */
-  private void processComplexFile(boolean useTable1, int charTable,
-                                     int charPlcSize, int parTable, int parPlcSize) throws IOException
-  {
-
-      //get the location of the piece table
-      int complexOffset = LittleEndian.getInt(_header, 0x1a2);
-
-      String tablename=null;
-      DocumentEntry tableEntry = null;
-      if(useTable1)
-      {
-          tablename="1Table";
-      }
-      else
-      {
-          tablename="0Table";
-      }
-      tableEntry = (DocumentEntry)filesystem.getRoot().getEntry(tablename);
-
-      //load the table stream into a buffer
-      int size = tableEntry.getSize();
-      byte[] tableStream = new byte[size];
-      filesystem.createDocumentInputStream(tablename).read(tableStream);
-
-      //init the DOP for this document
-      initDocProperties(tableStream);
-      //load the header/footer raw data for this document
-      initPclfHdd(tableStream);
-      //parse out the text locations
-      findText(tableStream, complexOffset);
-      //parse out text formatting
-      findFormatting(tableStream, charTable, charPlcSize, parTable, parPlcSize);
-
-  }
-  /**
-   * Goes through the piece table and parses out the info regarding the text
-   * blocks. For Word 97 and greater all text is stored in the "complex" way
-   * because of unicode.
-   *
-   * @param tableStream buffer containing the main table stream.
-   * @param beginning of the complex data.
-   * @throws IOException
-   */
-  private void findText(byte[] tableStream, int complexOffset) throws IOException
-  {
-    //actual text
-    int pos = complexOffset;
-    //skips through the prms before we reach the piece table. These contain data
-    //for actual fast saved files
-    while(tableStream[pos] == 1)
-    {
-        pos++;
-        int skip = LittleEndian.getShort(tableStream, pos);
-        pos += 2 + skip;
-    }
-    if(tableStream[pos] != 2)
-    {
-        throw new IOException("corrupted Word file");
-    }
-    //parse out the text pieces
-    int pieceTableSize = LittleEndian.getInt(tableStream, ++pos);
-    pos += 4;
-    int pieces = (pieceTableSize - 4) / 12;
-    for (int x = 0; x < pieces; x++)
-    {
-        int filePos = LittleEndian.getInt(tableStream, pos + ((pieces + 1) * 4) + (x * 8) + 2);
-        boolean unicode = false;
-        if ((filePos & 0x40000000) == 0)
-        {
-            unicode = true;
-        }
-        else
-        {
-            unicode = false;
-            filePos &= ~(0x40000000);//gives me FC in doc stream
-            filePos /= 2;
-        }
-        int totLength = LittleEndian.getInt(tableStream, pos + (x + 1) * 4) -
-                        LittleEndian.getInt(tableStream, pos + (x * 4));
-
-        TextPiece piece = new TextPiece(filePos, totLength, unicode);
-        _text.add(piece);
-    }
-  }
-
-  /**
-   * Does all of the formatting parsing
-   *
-   * @param tableStream Main table stream buffer.
-   * @param charOffset beginning of the character bin table.
-   * @param chrPlcSize size of the char bin table.
-   * @param parOffset offset of the paragraph bin table.
-   * @param size of the paragraph bin table.
-   */
-  private void findFormatting(byte[] tableStream, int charOffset,
-                              int charPlcSize, int parOffset, int parPlcSize) {
-      openDoc();
-      createStyleSheet(tableStream);
-      createListTables(tableStream);
-      createFontTable(tableStream);
-
-      //find character runs
-      //Get all the chpx info and store it
-
-      int arraySize = (charPlcSize - 4)/8;
-
-      //first we must go through the bin table and find the fkps
-      for(int x = 0; x < arraySize; x++)
-      {
-
-
-          //get page number(has nothing to do with document page)
-          //containing the chpx for the paragraph
-          int PN = LittleEndian.getInt(tableStream, charOffset + (4 * (arraySize + 1) + (4 * x)));
-
-          byte[] fkp = new byte[512];
-          System.arraycopy(_header, (PN * 512), fkp, 0, 512);
-          //take each fkp and get the chpxs
-          int crun = Utils.convertUnsignedByteToInt(fkp[511]);
-          for(int y = 0; y < crun; y++)
-          {
-              //get the beginning fc of each paragraph text run
-              int fcStart = LittleEndian.getInt(fkp, y * 4);
-              int fcEnd = LittleEndian.getInt(fkp, (y+1) * 4);
-              //get the offset in fkp of the papx for this paragraph
-              int chpxOffset = 2 * Utils.convertUnsignedByteToInt(fkp[((crun + 1) * 4) + y]);
-
-              //optimization if offset == 0 use "Normal" style
-              if(chpxOffset == 0)
-
-              {
-                _characterTable.add(new ChpxNode(fcStart, fcEnd, new byte[0]));
-                continue;
-              }
-
-              int size = Utils.convertUnsignedByteToInt(fkp[chpxOffset]);
-
-              byte[] chpx = new byte[size];
-              System.arraycopy(fkp, ++chpxOffset, chpx, 0, size);
-              //_papTable.put(Integer.valueOf(fcStart), papx);
-              _characterTable.add(new ChpxNode(fcStart, fcEnd, chpx));
-          }
-
-      }
-
-      //find paragraphs
-      arraySize = (parPlcSize - 4)/8;
-      //first we must go through the bin table and find the fkps
-      for(int x = 0; x < arraySize; x++)
-      {
-          int PN = LittleEndian.getInt(tableStream, parOffset + (4 * (arraySize + 1) + (4 * x)));
-
-          byte[] fkp = new byte[512];
-          System.arraycopy(_header, (PN * 512), fkp, 0, 512);
-          //take each fkp and get the paps
-          int crun = Utils.convertUnsignedByteToInt(fkp[511]);
-          for(int y = 0; y < crun; y++)
-          {
-              //get the beginning fc of each paragraph text run
-              int fcStart = LittleEndian.getInt(fkp, y * 4);
-              int fcEnd = LittleEndian.getInt(fkp, (y+1) * 4);
-              //get the offset in fkp of the papx for this paragraph
-              int papxOffset = 2 * Utils.convertUnsignedByteToInt(fkp[((crun + 1) * 4) + (y * 13)]);
-              int size = 2 * Utils.convertUnsignedByteToInt(fkp[papxOffset]);
-              if(size == 0)
-              {
-                  size = 2 * Utils.convertUnsignedByteToInt(fkp[++papxOffset]);
-              }
-              else
-              {
-                  size--;
-              }
-
-              byte[] papx = new byte[size];
-              System.arraycopy(fkp, ++papxOffset, papx, 0, size);
-              _paragraphTable.add(new PapxNode(fcStart, fcEnd, papx));
-
-          }
-
-      }
-
-      //find sections
-      int fcMin = Utils.convertBytesToInt(_header, 0x18);
-      int plcfsedFC = Utils.convertBytesToInt(_header, 0xca);
-      int plcfsedSize = Utils.convertBytesToInt(_header, 0xce);
-      byte[] plcfsed = new byte[plcfsedSize];
-      System.arraycopy(tableStream, plcfsedFC, plcfsed, 0, plcfsedSize);
-
-      arraySize = (plcfsedSize - 4)/16;
-
-      //openDoc();
-
-      for(int x = 0; x < arraySize; x++)
-      {
-          int sectionStart = Utils.convertBytesToInt(plcfsed, x * 4) + fcMin;
-          int sectionEnd = Utils.convertBytesToInt(plcfsed, (x+1) * 4) + fcMin;
-          int sepxStart = Utils.convertBytesToInt(plcfsed, 4 * (arraySize + 1) + (x * 12) + 2);
-          int sepxSize = Utils.convertBytesToShort(_header, sepxStart);
-          byte[] sepx = new byte[sepxSize];
-          System.arraycopy(_header, sepxStart + 2, sepx, 0, sepxSize);
-          SepxNode node = new SepxNode(x + 1, sectionStart, sectionEnd, sepx);
-          _sectionTable.add(node);
-      }
-
-
-  }
-
-  public void openDoc()
-  {
-    _headerBuffer.append("<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\r\n");
-    _headerBuffer.append("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\r\n");
-    _headerBuffer.append("<fo:layout-master-set>\r\n");
-
-  }
-  private HeaderFooter findSectionHdrFtr(int type, int index)
-  {
-    if(_plcfHdd.length < 50)
-    {
-      return new HeaderFooter(0,0,0);
-    }
-    int start = _fcMin + _ccpText + _ccpFtn;
-    int end = start;
-    int arrayIndex = 0;
-
-    switch(type)
-    {
-      case HeaderFooter.HEADER_EVEN:
-           arrayIndex = (HEADER_EVEN_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_EVEN:
-           arrayIndex = (FOOTER_EVEN_INDEX + (index * 6));
-           break;
-      case HeaderFooter.HEADER_ODD:
-           arrayIndex = (HEADER_ODD_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_ODD:
-           arrayIndex = (FOOTER_ODD_INDEX + (index * 6));
-           break;
-      case HeaderFooter.HEADER_FIRST:
-           arrayIndex = (HEADER_FIRST_INDEX + (index * 6));
-           break;
-      case HeaderFooter.FOOTER_FIRST:
-           arrayIndex = (FOOTER_FIRST_INDEX + (index * 6));
-           break;
-    }
-    start += Utils.convertBytesToInt(_plcfHdd, (arrayIndex * 4));
-    end += Utils.convertBytesToInt(_plcfHdd, (arrayIndex + 1) * 4);
-
-    HeaderFooter retValue = new HeaderFooter(type, start, end);
-
-    if((end - start) == 0 && index > 1)
-    {
-      retValue = findSectionHdrFtr(type, index - 1);
-    }
-    return retValue;
-  }
-  /**
-   * inits this document DOP structure.
-   *
-   * @param tableStream The documents table stream.
-   */
-  private void initDocProperties(byte[] tableStream)
-  {
-    int pos = LittleEndian.getInt(_header, 0x192);
-    int size = LittleEndian.getInt(_header, 0x196);
-    byte[] dop = new byte[size];
-
-    System.arraycopy(tableStream, pos, dop, 0, size);
-
-    _docProps._fFacingPages = (dop[0] & 0x1) > 0;
-    _docProps._fpc = (dop[0] & 0x60) >> 5;
-
-    short num = LittleEndian.getShort(dop, 2);
-    _docProps._rncFtn = (num & 0x3);
-    _docProps._nFtn = (short)(num & 0xfffc) >> 2;
-    num = LittleEndian.getShort(dop, 52);
-    _docProps._rncEdn = num & 0x3;
-    _docProps._nEdn = (short)(num & 0xfffc) >> 2;
-    num = LittleEndian.getShort(dop, 54);
-    _docProps._epc = num & 0x3;
-  }
-
-  public void writeSection(int start, int end, SEP sep, BTreeSet text,
-                           BTreeSet paragraphTable, BTreeSet characterTable,
-                           StyleSheet stylesheet)
-  {
-
-    HeaderFooter titleHeader = findSectionHdrFtr(HeaderFooter.HEADER_FIRST, _sectionCounter);
-    HeaderFooter titleFooter = findSectionHdrFtr(HeaderFooter.FOOTER_FIRST, _sectionCounter);
-    HeaderFooter oddHeader = findSectionHdrFtr(HeaderFooter.HEADER_ODD, _sectionCounter);
-    HeaderFooter evenHeader = findSectionHdrFtr(HeaderFooter.HEADER_EVEN, _sectionCounter);
-    HeaderFooter oddFooter = findSectionHdrFtr(HeaderFooter.FOOTER_ODD, _sectionCounter);
-    HeaderFooter evenFooter = findSectionHdrFtr(HeaderFooter.FOOTER_EVEN, _sectionCounter);
-
-    String titlePage = null;
-    String evenPage = null;
-    String oddPage = null;
-    String regPage = null;
-
-    String sequenceName = null;
-
-    /*if(sep._fTitlePage)
-    {
-      titlePage = createPageMaster(sep, "first", _sectionCounter, createRegion("before", "title-header"), createRegion("after", "title-footer"));
-
-      if(!titleHeader.isEmpty())
-      {
-        addStaticContent("title-header" + _sectionCounter, titleHeader);
-      }
-      if(!titleFooter.isEmpty())
-      {
-        addStaticContent("title-footer" + _sectionCounter, titleFooter);
-      }
-    }*/
-
-    if(_docProps._fFacingPages)
-    {
-      if(sep._fTitlePage)
-      {
-        String before = createRegion(true, titleHeader, sep, "title-header" + _sectionCounter);
-        String after = createRegion(false, titleFooter, sep, "title-footer" + _sectionCounter);
-        titlePage = createPageMaster(sep, "first", _sectionCounter, before, after);
-      }
-      String before = createRegion(true, evenHeader, sep, "even-header" + _sectionCounter);
-      String after = createRegion(false, evenFooter, sep, "even-footer" + _sectionCounter);
-      evenPage = createPageMaster(sep, "even", _sectionCounter, before, after);
-      before = createRegion(true, oddHeader, sep, "odd-header" + _sectionCounter);
-      after = createRegion(false, oddFooter, sep, "odd-footer" + _sectionCounter);
-      oddPage = createPageMaster(sep, "odd", _sectionCounter, before, after);
-      sequenceName = createEvenOddPageSequence(titlePage, evenPage, oddPage, _sectionCounter);
-
-      openPage(sequenceName, "reference");
-
-      if(sep._fTitlePage)
-      {
-
-
-        if(!titleHeader.isEmpty())
-        {
-          addStaticContent("title-header" + _sectionCounter, titleHeader);
-        }
-        if(!titleFooter.isEmpty())
-        {
-          addStaticContent("title-footer" + _sectionCounter, titleFooter);
-        }
-      }
-
-      //handle the headers and footers for odd and even pages
-      if(!oddHeader.isEmpty())
-      {
-        addStaticContent("odd-header" + _sectionCounter, oddHeader);
-      }
-      if(!oddFooter.isEmpty())
-      {
-        addStaticContent("odd-footer" + _sectionCounter, oddFooter);
-      }
-      if(!evenHeader.isEmpty())
-      {
-        addStaticContent("even-header" + _sectionCounter, evenHeader);
-      }
-      if(!evenFooter.isEmpty())
-      {
-        addStaticContent("even-footer" + _sectionCounter, evenFooter);
-      }
-      openFlow();
-      addBlockContent(start, end, text, paragraphTable, characterTable);
-      closeFlow();
-      closePage();
-    }
-    else
-    {
-      /*if(sep._fTitlePage)
-      {
-        String before = createRegion(true, titleHeader, sep);
-        String after = createRegion(false, titleFooter, sep);
-        titlePage = createPageMaster(sep, "first", _sectionCounter, before, after);
-      }*/
-      String before = createRegion(true, oddHeader, sep, null);
-      String after = createRegion(false, oddFooter, sep, null);
-      regPage = createPageMaster(sep, "page", _sectionCounter, before, after);
-
-      if(sep._fTitlePage)
-      {
-        before = createRegion(true, titleHeader, sep, "title-header" + _sectionCounter);
-        after = createRegion(false, titleFooter, sep, "title-footer" + _sectionCounter);
-        titlePage = createPageMaster(sep, "first", _sectionCounter, before, after);
-        sequenceName = createPageSequence(titlePage, regPage, _sectionCounter);
-        openPage(sequenceName, "reference");
-
-        if(!titleHeader.isEmpty())
-        {
-          addStaticContent("title-header" + _sectionCounter, titleHeader);
-        }
-        if(!titleFooter.isEmpty())
-        {
-          addStaticContent("title-footer" + _sectionCounter, titleFooter);
-        }
-      }
-      else
-      {
-        openPage(regPage, "name");
-      }
-      if(!oddHeader.isEmpty())
-      {
-        addStaticContent("xsl-region-before", oddHeader);
-      }
-      if(!oddFooter.isEmpty())
-      {
-        addStaticContent("xsl-region-after", oddFooter);
-      }
-      openFlow();
-      addBlockContent(start, end, text, paragraphTable, characterTable);
-      closeFlow();
-      closePage();
-    }
-    _sectionCounter++;
-  }
-
-  @SuppressWarnings("unused")
-  private int calculateHeaderHeight(int start, int end, int pageWidth)
-  {
-    ArrayList<PropertyNode> paragraphs = findProperties(start, end, _paragraphTable.root);
-    int size = paragraphs.size();
-    ArrayList<Integer> lineHeights = new ArrayList<Integer>();
-    //StyleContext context = StyleContext.getDefaultStyleContext();
-
-    for(int x = 0; x < size; x++)
-    {
-      PapxNode node = (PapxNode)paragraphs.get(x);
-      int parStart = Math.max(node.getStart(), start);
-      int parEnd = Math.min(node.getEnd(), end);
-
-      int lineWidth = 0;
-      int maxHeight = 0;
-
-      ArrayList<PropertyNode> textRuns = findProperties(parStart, parEnd, _characterTable.root);
-      int charSize = textRuns.size();
-
-      //StringBuffer lineBuffer = new StringBuffer();
-      for(int y = 0; y < charSize; y++)
-      {
-        ChpxNode charNode = (ChpxNode)textRuns.get(y);
-        int istd = Utils.convertBytesToShort(node.getPapx(), 0);
-        StyleDescription sd = _styleSheet.getStyleDescription(istd);
-        CHP chp = (CHP)StyleSheet.uncompressProperty(charNode.getChpx(), sd.getCHP(), _styleSheet);
-
-        //get Font info
-        //FontMetrics metrics = getFontMetrics(chp, context);
-
-        int height = 10;//metrics.getHeight();
-        maxHeight = Math.max(maxHeight, height);
-
-        int charStart = Math.max(parStart, charNode.getStart());
-        int charEnd = Math.min(parEnd, charNode.getEnd());
-
-        ArrayList<PropertyNode> text = findProperties(charStart, charEnd, _text.root);
-
-        int textSize = text.size();
-        StringBuffer buf = new StringBuffer();
-        for(int z = 0; z < textSize; z++)
-        {
-
-          TextPiece piece = (TextPiece)text.get(z);
-          int textStart = Math.max(piece.getStart(), charStart);
-          int textEnd = Math.min(piece.getEnd(), charEnd);
-
-          if(piece.usesUnicode())
-          {
-            addUnicodeText(textStart, textEnd, buf);
-          }
-          else
-          {
-            addText(textStart, textEnd, buf);
-          }
-        }
-
-        String tempString = buf.toString();
-        lineWidth += 10 * tempString.length();//metrics.stringWidth(tempString);
-        if(lineWidth > pageWidth)
-        {
-          lineHeights.add(Integer.valueOf(maxHeight));
-          maxHeight = 0;
-          lineWidth = 0;
-        }
-      }
-      lineHeights.add(Integer.valueOf(maxHeight));
-    }
-    int sum = 0;
-    size = lineHeights.size();
-    for(int x = 0; x < size; x++)
-    {
-      Integer height = lineHeights.get(x);
-      sum += height.intValue();
-    }
-
-    return sum;
-  }
-/*  private FontMetrics getFontMetrics(CHP chp, StyleContext context)
-  {
-    String fontName = _fonts.getFont(chp._ftcAscii);
-    int style = 0;
-    if(chp._bold)
-    {
-      style |= Font.BOLD;
-    }
-    if(chp._italic)
-    {
-      style |= Font.ITALIC;
-    }
-
-    Font font = new Font(fontName, style, chp._hps/2);
-
-
-    return context.getFontMetrics(font);
-  }*/
-  private String createRegion(boolean before, HeaderFooter header, SEP sep, String name)
-  {
-    if(header.isEmpty())
-    {
-      return "";
-    }
-    String region = "region-name=\"" + name + "\"";
-    if(name == null)
-    {
-      region = "";
-    }
-    int height = calculateHeaderHeight(header.getStart(), header.getEnd(), sep._xaPage/20);
-    int marginTop = 0;
-    int marginBottom = 0;
-    int extent = 0;
-    String where = null;
-    String align = null;
-
-    if(before)
-    {
-      where = "before";
-      align = "before";
-      marginTop = sep._dyaHdrTop/20;
-      extent = height + marginTop;
-      sep._dyaTop = Math.max(extent*20, sep._dyaTop);
-    }
-    else
-    {
-      where = "after";
-      align = "after";
-      marginBottom = sep._dyaHdrBottom/20;
-      extent = height + marginBottom;
-      sep._dyaBottom = Math.max(extent*20, sep._dyaBottom);
-    }
-
-    //int marginLeft = sep._dxaLeft/20;
-    //int marginRight = sep._dxaRight/20;
-
-    return "<fo:region-" + where + " display-align=\"" + align + "\" extent=\""
-             + extent + "pt\" "+region+"/>";
-// org.apache.fop.fo.expr.PropertyException:
-// Border and padding for region "xsl-region-before" must be '0'
-// (See 6.4.13 in XSL 1.0).
-//             extent + "pt\" padding-left=\"" + marginLeft + "pt\" padding-right=\"" +
-//             marginRight + "pt\" padding-top=\"" + marginTop + "pt\" padding-bottom=\"" +
-//             marginBottom + "pt\" " + region + "/>";
-
-  }
-  @SuppressWarnings("unused")
-  private String createRegion(String where, String name)
-  {
-    return "<fo:region-" + where + " overflow=\"scroll\" region-name=\"" + name + "\"/>";
-  }
-  private String createEvenOddPageSequence(String titlePage, String evenPage, String oddPage, int counter)
-  {
-    String name = "my-sequence" + counter;
-    _headerBuffer.append("<fo:page-sequence-master master-name=\"" + name + "\"> ");
-    _headerBuffer.append("<fo:repeatable-page-master-alternatives>");
-    if(titlePage != null)
-    {
-      _headerBuffer.append("<fo:conditional-page-master-reference " +
-                           "page-position=\"first\" master-reference=\"" +
-                            titlePage + "\"/>");
-    }
-    _headerBuffer.append("<fo:conditional-page-master-reference odd-or-even=\"odd\" ");
-    _headerBuffer.append("master-reference=\""+ oddPage + "\"/> ");
-    _headerBuffer.append("<fo:conditional-page-master-reference odd-or-even=\"even\" ");
-    _headerBuffer.append("master-reference=\"" + evenPage + "\"/> ");
-    _headerBuffer.append("</fo:repeatable-page-master-alternatives>");
-    _headerBuffer.append("</fo:page-sequence-master>");
-    return name;
-  }
-  private String createPageSequence(String titlePage, String regPage, int counter)
-  {
-    String name = null;
-    if(titlePage != null)
-    {
-      name = "my-sequence" + counter;
-      _headerBuffer.append("<fo:page-sequence-master master-name=\"" + name + "\"> ");
-      _headerBuffer.append("<fo:single-page-master-reference master-reference=\"" + titlePage + "\"/>");
-      _headerBuffer.append("<fo:repeatable-page-master-reference master-reference=\"" + regPage + "\"/>");
-      _headerBuffer.append("</fo:page-sequence-master>");
-    }
-    return name;
-  }
-  private void addBlockContent(int start, int end, BTreeSet text,
-                              BTreeSet paragraphTable, BTreeSet characterTable)
-  {
-
-    BTreeSet.BTreeNode root = paragraphTable.root;
-    ArrayList<PropertyNode> pars = findProperties(start, end, root);
-    //root = characterTable.root;
-    int size = pars.size();
-
-    for(int c = 0; c < size; c++)
-    {
-      PapxNode currentNode = (PapxNode)pars.get(c);
-      createParagraph(start, end, currentNode, characterTable, text);
-    }
-    //closePage();
-  }
-  private String getTextAlignment(byte jc)
-  {
-    switch(jc)
-    {
-      case 0:
-        return "start";
-      case 1:
-        return "center";
-      case 2:
-        return "end";
-      case 3:
-        return "justify";
-      default:
-        return "left";
-    }
-  }
-  private void createParagraph(int start, int end, PapxNode currentNode,
-                               BTreeSet characterTable, BTreeSet text)
-  {
-    StringBuffer blockBuffer = _bodyBuffer;
-    byte[] papx = currentNode.getPapx();
-    int istd = Utils.convertBytesToShort(papx, 0);
-    StyleDescription std = _styleSheet.getStyleDescription(istd);
-    PAP pap = (PAP)StyleSheet.uncompressProperty(papx, std.getPAP(), _styleSheet);
-
-    //handle table cells
-    if(pap._fInTable > 0)
-    {
-      if(pap._fTtp == 0)
-      {
-        if(_cellBuffer == null)
-        {
-          _cellBuffer = new StringBuffer();
-        }
-        blockBuffer = _cellBuffer;
-      }
-      else
-      {
-        if(_table == null)
-        {
-          _table = new ArrayList<TableRow>();
-        }
-        TAP tap = (TAP)StyleSheet.uncompressProperty(papx, new TAP(), _styleSheet);
-        TableRow nextRow = new TableRow(_cells, tap);
-        _table.add(nextRow);
-        _cells = null;
-        return;
-      }
-    }
-    else
-    {
-      //just prints out any table that is stored in _table
-      printTable();
-    }
-
-    if(pap._ilfo > 0)
-    {
-      LVL lvl = _listTables.getLevel(pap._ilfo, pap._ilvl);
-      addListParagraphContent(lvl, blockBuffer, pap, currentNode, start, end, std);
-    }
-    else
-    {
-      addParagraphContent(blockBuffer, pap, currentNode, start, end, std);
-    }
-
-  }
-
-  @SuppressWarnings("unused")
-  private void addListParagraphContent(LVL lvl, StringBuffer blockBuffer, PAP pap,
-                                       PapxNode currentNode, int start, int end,
-                                       StyleDescription std)
-  {
-    pap = (PAP)StyleSheet.uncompressProperty(lvl._papx, pap, _styleSheet, false);
-
-    addParagraphProperties(pap, blockBuffer);
-
-    ArrayList<PropertyNode> charRuns = findProperties(Math.max(currentNode.getStart(), start),
-                                     Math.min(currentNode.getEnd(), end),
-                                     _characterTable.root);
-    int len = charRuns.size();
-
-    CHP numChp = (CHP)StyleSheet.uncompressProperty(((ChpxNode)charRuns.get(len-1)).getChpx(), std.getCHP(), _styleSheet);
-
-    numChp = (CHP)StyleSheet.uncompressProperty(lvl._chpx, numChp, _styleSheet);
-
-    //StyleContext context = StyleContext.getDefaultStyleContext();
-    //FontMetrics metrics = getFontMetrics(numChp, context);
-    int indent = -1 * pap._dxaLeft1;
-    String bulletText = getBulletText(lvl, pap);
-
-    indent = indent - (bulletText.length() * 10) * 20;//(metrics.stringWidth(bulletText) * 20);
-
-    if(indent > 0)
-    {
-      numChp._paddingEnd = (short)indent;
-    }
-
-    addCharacterProperties(numChp, blockBuffer);
-    int listNum = 0;
-
-    //if(number != null)
-    //{
-    blockBuffer.append(bulletText);
-      //listNum = 1;
-    //}
-
-    //for(;listNum < lvl._xst.length; listNum++)
-    //{
-    //  addText(lvl._xst[listNum], blockBuffer);
-    //}
-
-
-    switch (lvl._ixchFollow)
-    {
-      case 0:
-        addText('\u0009', blockBuffer);
-        break;
-      case 1:
-        addText(' ', blockBuffer);
-        break;
-    }
-
-    closeLine(blockBuffer);
-    for(int x = 0; x < len; x++)
-    {
-      ChpxNode charNode = (ChpxNode)charRuns.get(x);
-      byte[] chpx = charNode.getChpx();
-      CHP chp = (CHP)StyleSheet.uncompressProperty(chpx, std.getCHP(), _styleSheet);
-
-
-      addCharacterProperties(chp, blockBuffer);
-
-      int charStart = Math.max(charNode.getStart(), currentNode.getStart());
-      int charEnd = Math.min(charNode.getEnd(), currentNode.getEnd());
-      ArrayList<PropertyNode> textRuns = findProperties(charStart, charEnd, _text.root);
-      int textRunLen = textRuns.size();
-      for(int y = 0; y < textRunLen; y++)
-      {
-        TextPiece piece = (TextPiece)textRuns.get(y);
-        charStart = Math.max(charStart, piece.getStart());
-        charEnd = Math.min(charEnd, piece.getEnd());
-
-        if(piece.usesUnicode())
-        {
-          addUnicodeText(charStart, charEnd, blockBuffer);
-        }
-        else
-        {
-          addText(charStart, charEnd, blockBuffer);
-        }
-        closeLine(blockBuffer);
-      }
-    }
-    closeBlock(blockBuffer);
-  }
-
-  private void addParagraphContent(StringBuffer blockBuffer, PAP pap,
-                                   PapxNode currentNode, int start, int end,
-                                   StyleDescription std)
-  {
-    addParagraphProperties(pap, blockBuffer);
-
-    ArrayList<PropertyNode> charRuns = findProperties(Math.max(currentNode.getStart(), start),
-                                     Math.min(currentNode.getEnd(), end),
-                                     _characterTable.root);
-    int len = charRuns.size();
-
-    for(int x = 0; x < len; x++)
-    {
-      ChpxNode charNode = (ChpxNode)charRuns.get(x);
-      byte[] chpx = charNode.getChpx();
-      CHP chp = (CHP)StyleSheet.uncompressProperty(chpx, std.getCHP(), _styleSheet);
-
-      addCharacterProperties(chp, blockBuffer);
-
-      int charStart = Math.max(charNode.getStart(), currentNode.getStart());
-      int charEnd = Math.min(charNode.getEnd(), currentNode.getEnd());
-      ArrayList<PropertyNode> textRuns = findProperties(charStart, charEnd, _text.root);
-      int textRunLen = textRuns.size();
-      for(int y = 0; y < textRunLen; y++)
-      {
-        TextPiece piece = (TextPiece)textRuns.get(y);
-        charStart = Math.max(charStart, piece.getStart());
-        charEnd = Math.min(charEnd, piece.getEnd());
-
-        if(piece.usesUnicode())
-        {
-          addUnicodeText(charStart, charEnd, blockBuffer);
-        }
-        else
-        {
-          addText(charStart, charEnd, blockBuffer);
-        }
-        closeLine(blockBuffer);
-      }
-    }
-    closeBlock(blockBuffer);
-  }
-  private void addText(int start, int end, StringBuffer buf)
-  {
-    for(int x = start; x < end; x++)
-    {
-      char ch = '?';
-
-
-      ch = (char)_header[x];
-
-      addText(ch, buf);
-    }
-  }
-  private void addText(char ch, StringBuffer buf)
-  {
-    int num = 0xffff & ch;
-    if((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
-      (ch >= '0' && ch <= '9') || ch == '_' || ch == ' ' || ch == '-' || ch == '.' || ch == '$')
-    {
-      buf.append(ch);
-    }
-    else if(num == 0x07 && _cellBuffer != null)
-    {
-
-      if(_cells == null)
-      {
-        _cells = new ArrayList<String>();
-      }
-      closeLine(_cellBuffer);
-      closeBlock(_cellBuffer);
-      _cells.add(_cellBuffer.toString());
-      _cellBuffer = null;
-
-    }
-
-    else
-    {
-      /** @todo handle special characters */
-      if(num < 0x20)
-      num=0x20;
-      buf.append("&#");
-      buf.append(num);
-      buf.append(';');
-    }
-  }
-  private void addUnicodeText(int start, int end, StringBuffer buf)
-  {
-    for(int x = start; x < end; x += 2)
-    {
-      char ch = Utils.getUnicodeCharacter(_header, x);
-      //if(ch < 0x0020)
-      //{
-      //  _bodyBuffer.append('?');
-      //}
-      //else
-      //{
-        addText(ch, buf);
-      //}
-    }
-  }
-  private void addParagraphProperties(PAP pap, StringBuffer buf)
-  {
-    buf.append("<fo:block ");
-    buf.append("text-align=\"" + getTextAlignment(pap._jc) + "\"\r\n");
-    buf.append("linefeed-treatment=\"preserve\" ");
-    buf.append("white-space-collapse=\"false\" ");
-
-    if(pap._fKeep > 0)
-    {
-      buf.append("keep-together.within-page=\"always\"\r\n");
-    }
-    if(pap._fKeepFollow > 0)
-    {
-      buf.append("keep-with-next.within-page=\"always\"\r\n");
-    }
-    if(pap._fPageBreakBefore > 0)
-    {
-      buf.append("break-before=\"page\"\r\n");
-    }
-    if(pap._fNoAutoHyph == 0)
-    {
-      buf.append("hyphenate=\"true\"\r\n");
-    }
-    else
-    {
-      buf.append("hyphenate=\"false\"\r\n");
-    }
-    if(pap._dxaLeft > 0)
-    {
-      buf.append("start-indent=\"" + pap._dxaLeft/K_1440_0F + "in\"\r\n");
-    }
-    if(pap._dxaRight > 0)
-    {
-      buf.append("end-indent=\"" + pap._dxaRight/K_1440_0F + "in\"\r\n");
-    }
-    if(pap._dxaLeft1 != 0)
-    {
-      buf.append("text-indent=\"" + pap._dxaLeft1/K_1440_0F + "in\"\r\n");
-    }
-    if(pap._lspd[1] == 0)
-    {
-      //buf.append("line-height=\"" + pap._lspd[0]/K_1440_0F + "in\"\r\n");
-    }
-    addBorder(buf, pap._brcTop, "top");
-    addBorder(buf, pap._brcBottom, "bottom");
-    addBorder(buf, pap._brcLeft, "left");
-    addBorder(buf, pap._brcRight, "right");
-
-    buf.append(">");
-
-  }
-
-  private void addCharacterProperties(CHP chp, StringBuffer buf)
-  {
-    buf.append("<fo:inline ");
-    buf.append("font-family=\"" + _fonts.getFont(chp._ftcAscii) + "\" ");
-    buf.append("font-size=\"" + (chp._hps / 2) + "pt\" ");
-    buf.append("color=\"" + getColor(chp._ico) + "\" ");
-    //not supported by fop
-    //buf.append("letter-spacing=\"" + ((double)chp._dxaSpace)/K_1440_0F + "in\" ");
-
-    addBorder(buf, chp._brc, "top");
-    addBorder(buf, chp._brc, "bottom");
-    addBorder(buf, chp._brc, "left");
-    addBorder(buf, chp._brc, "right");
-
-    if(chp._italic)
-    {
-      buf.append("font-style=\"italic\" ");
-    }
-    if(chp._bold)
-    {
-      buf.append("font-weight=\"bold\" ");
-    }
-    if(chp._fSmallCaps)
-    {
-      buf.append("font-variant=\"small-caps\" ");
-    }
-    if(chp._fCaps)
-    {
-      buf.append("text-transform=\"uppercase\" ");
-    }
-    if(chp._fStrike || chp._fDStrike)
-    {
-      buf.append("text-decoration=\"line-through\" ");
-    }
-    if(chp._fShadow)
-    {
-      int size = chp._hps/24;
-      buf.append("text-shadow=\"" + size + "pt\"");
-    }
-    if(chp._fLowerCase)
-    {
-      buf.append("text-transform=\"lowercase\" ");
-    }
-    if(chp._kul > 0)
-    {
-      buf.append("text-decoration=\"underline\" ");
-    }
-    if(chp._highlighted)
-    {
-      buf.append("background-color=\"" + getColor(chp._icoHighlight) + "\" ");
-    }
-    if(chp._paddingStart != 0)
-    {
-      buf.append("padding-start=\"" + chp._paddingStart/K_1440_0F + "in\" ");
-    }
-    if(chp._paddingEnd != 0)
-    {
-      buf.append("padding-end=\"" + chp._paddingEnd/K_1440_0F + "in\" ");
-    }
-    buf.append(">");
-  }
-  private void addStaticContent(String flowName, HeaderFooter content)
-  {
-    _bodyBuffer.append("<fo:static-content flow-name=\"" + flowName + "\">");
-    //_bodyBuffer.append("<fo:float float=\"before\">");
-    addBlockContent(content.getStart(), content.getEnd(),_text, _paragraphTable, _characterTable);
-    //_bodyBuffer.append("</fo:float>");
-    _bodyBuffer.append("</fo:static-content>");
-
-  }
-  private String getBulletText(LVL lvl, PAP pap)
-  {
-    StringBuffer bulletBuffer = new StringBuffer();
-    for(int x = 0; x < lvl._xst.length; x++)
-    {
-      if(lvl._xst[x] < 9)
-      {
-        LVL numLevel = _listTables.getLevel(pap._ilfo, lvl._xst[x]);
-        int num = numLevel._iStartAt;
-        if(lvl == numLevel)
-        {
-          numLevel._iStartAt++;
-        }
-        else if(num > 1)
-        {
-          num--;
-        }
-        bulletBuffer.append(NumberFormatter.getNumber(num, lvl._nfc));
-
-      }
-      else
-      {
-        bulletBuffer.append(lvl._xst[x]);
-      }
-
-    }
-    return bulletBuffer.toString();
-  }
-  /**
-   * finds all chpx's that are between start and end
-   */
-  private ArrayList<PropertyNode> findProperties(int start, int end, BTreeSet.BTreeNode root)
-  {
-    ArrayList<PropertyNode> results = new ArrayList<PropertyNode>();
-    BTreeSet.Entry[] entries = root._entries;
-
-    for(int x = 0; x < entries.length; x++)
-    {
-      if(entries[x] != null)
-      {
-        BTreeSet.BTreeNode child = entries[x].child;
-        PropertyNode xNode = (PropertyNode)entries[x].element;
-        if(xNode != null)
-        {
-          int xStart = xNode.getStart();
-          int xEnd = xNode.getEnd();
-          if(xStart < end)
-          {
-            if(xStart >= start)
-            {
-              if(child != null)
-              {
-                ArrayList<PropertyNode> beforeItems = findProperties(start, end, child);
-                results.addAll(beforeItems);
-              }
-              results.add(xNode);
-            }
-            else if(start < xEnd)
-            {
-              results.add(xNode);
-              //break;
-            }
-          }
-          else
-          {
-            if(child != null)
-            {
-              ArrayList<PropertyNode> beforeItems = findProperties(start, end, child);
-              results.addAll(beforeItems);
-            }
-            break;
-          }
-        }
-        else if(child != null)
-        {
-          ArrayList<PropertyNode> afterItems = findProperties(start, end, child);
-          results.addAll(afterItems);
-        }
-      }
-      else
-      {
-        break;
-      }
-    }
-    return results;
-  }
-  private void openPage(String page, String type)
-  {
-    _bodyBuffer.append("<fo:page-sequence master-reference=\"" + page + "\">\r\n");
-  }
-  private void openFlow()
-  {
-    _bodyBuffer.append("<fo:flow flow-name=\"xsl-region-body\">\r\n");
-  }
-  private void closeFlow()
-  {
-    _bodyBuffer.append("</fo:flow>\r\n");
-  }
-  private void closePage()
-  {
-    _bodyBuffer.append("</fo:page-sequence>\r\n");
-  }
-  private void closeLine(StringBuffer buf)
-  {
-    buf.append("</fo:inline>");
-  }
-  private void closeBlock(StringBuffer buf)
-  {
-    buf.append("</fo:block>\r\n");
-  }
-  @SuppressWarnings("unused")
-  private ArrayList<PropertyNode> findPAPProperties(int start, int end, BTreeSet.BTreeNode root)
-  {
-    ArrayList<PropertyNode> results = new ArrayList<PropertyNode>();
-    BTreeSet.Entry[] entries = root._entries;
-
-    for(int x = 0; x < entries.length; x++)
-    {
-      if(entries[x] != null)
-      {
-        BTreeSet.BTreeNode child = entries[x].child;
-        PapxNode papxNode = (PapxNode)entries[x].element;
-        if(papxNode != null)
-        {
-          int papxStart = papxNode.getStart();
-          if(papxStart < end)
-          {
-            if(papxStart >= start)
-            {
-              if(child != null)
-              {
-                ArrayList<PropertyNode> beforeItems = findPAPProperties(start, end, child);
-                results.addAll(beforeItems);
-              }
-              results.add(papxNode);
-            }
-          }
-          else
-          {
-            if(child != null)
-            {
-              ArrayList<PropertyNode> beforeItems = findPAPProperties(start, end, child);
-              results.addAll(beforeItems);
-            }
-            break;
-          }
-        }
-        else if(child != null)
-        {
-          ArrayList<PropertyNode> afterItems = findPAPProperties(start, end, child);
-          results.addAll(afterItems);
-        }
-      }
-      else
-      {
-        break;
-      }
-    }
-    return results;
-  }
-
-  private String createPageMaster(SEP sep, String type, int section,
-                                  String regionBefore, String regionAfter)
-  {
-    float height = sep._yaPage/K_1440_0F;
-    float width = sep._xaPage/K_1440_0F;
-    float leftMargin = sep._dxaLeft/K_1440_0F;
-    float rightMargin = sep._dxaRight/K_1440_0F;
-    float topMargin = sep._dyaTop/K_1440_0F;
-    float bottomMargin = sep._dyaBottom/K_1440_0F;
-
-    //add these to the header
-    String thisPage = type + "-page" + section;
-
-    _headerBuffer.append("<fo:simple-page-master master-name=\"" +
-                        thisPage + "\"\r\n");
-    _headerBuffer.append("page-height=\"" + height + "in\"\r\n");
-    _headerBuffer.append("page-width=\"" + width + "in\"\r\n");
-    _headerBuffer.append(">\r\n");
-
-
-
-    _headerBuffer.append("<fo:region-body ");
-    //top right bottom left
-
-    _headerBuffer.append("margin=\"" + topMargin + "in " + rightMargin + "in " +
-                         bottomMargin + "in " + leftMargin + "in\"\r\n");
-
-    //String style = null;
-    //String color = null;
-    addBorder(_headerBuffer, sep._brcTop, "top");
-    addBorder(_headerBuffer, sep._brcBottom, "bottom");
-    addBorder(_headerBuffer, sep._brcLeft, "left");
-    addBorder(_headerBuffer, sep._brcRight, "right");
-
-    if(sep._ccolM1 > 0)
-    {
-      _headerBuffer.append("column-count=\"" + (sep._ccolM1 + 1) + "\" ");
-      if(sep._fEvenlySpaced)
-      {
-        _headerBuffer.append("column-gap=\"" + sep._dxaColumns/K_1440_0F + "in\"");
-      }
-      else
-      {
-        _headerBuffer.append("column-gap=\"0.25in\"");
-      }
-    }
-    _headerBuffer.append("/>\r\n");
-
-    if(regionBefore != null)
-    {
-      _headerBuffer.append(regionBefore);
-    }
-    if(regionAfter != null)
-    {
-      _headerBuffer.append(regionAfter);
-    }
-
-    _headerBuffer.append("</fo:simple-page-master>\r\n");
-    return thisPage;
-  }
-
-  private void addBorder(StringBuffer buf, short[] brc, String where)
-  {
-    if((brc[0] & 0xff00) != 0 && brc[0] != -1)
-    {
-      // int type = (brc[0] & 0xff00) >> 8;
-      float width = (brc[0] & 0x00ff)/8.0f;
-      String style = getBorderStyle(brc[0]);
-      String color = getColor(brc[1] & 0x00ff);
-      // String thickness = getBorderThickness(brc[0]);
-      buf.append("border-" + where + "-style=\"" + style + "\"\r\n");
-      buf.append("border-" + where + "-color=\"" + color + "\"\r\n");
-      buf.append("border-" + where + "-width=\"" + width + "pt\"\r\n");
-    }
-  }
-  public void closeDoc()
-  {
-    _headerBuffer.append("</fo:layout-master-set>");
-    _bodyBuffer.append("</fo:root>");
-    //_headerBuffer.append();
-
-    //test code
-    try
-    {
-      OutputStreamWriter test = new OutputStreamWriter(new FileOutputStream(_outName), "8859_1");
-      test.write(_headerBuffer.toString());
-      test.write(_bodyBuffer.toString());
-      test.flush();
-      test.close();
-    }
-    catch(Exception t)
-    {
-      t.printStackTrace();
-    }
-  }
-//  private String getBorderThickness(int style)
-//  {
-//    switch(style)
-//    {
-//      case 1:
-//        return "medium";
-//      case 2:
-//        return "thick";
-//      case 3:
-//        return "medium";
-//      case 5:
-//        return "thin";
-//      default:
-//        return "medium";
-//    }
-//  }
-
-
-  private String getColor(int ico)
-  {
-    switch(ico)
-    {
-      case 1:
-        return "black";
-      case 2:
-        return "blue";
-      case 3:
-        return "cyan";
-      case 4:
-        return "green";
-      case 5:
-        return "magenta";
-      case 6:
-        return "red";
-      case 7:
-        return "yellow";
-      case 8:
-        return "white";
-      case 9:
-        return "darkblue";
-      case 10:
-        return "darkcyan";
-      case 11:
-        return "darkgreen";
-      case 12:
-        return "darkmagenta";
-      case 13:
-        return "darkred";
-      case 14:
-        return "darkyellow";
-      case 15:
-        return "darkgray";
-      case 16:
-        return "lightgray";
-      default:
-        return "black";
-    }
-  }
-
-  private String getBorderStyle(int type)
-  {
-
-    switch(type)
-    {
-      case 1:
-      case 2:
-        return "solid";
-      case 3:
-        return "double";
-      case 5:
-        return "solid";
-      case 6:
-        return "dotted";
-      case 7:
-      case 8:
-        return "dashed";
-      case 9:
-        return "dotted";
-      case 10:
-      case 11:
-      case 12:
-      case 13:
-      case 14:
-      case 15:
-      case 16:
-      case 17:
-      case 18:
-      case 19:
-        return "double";
-      case 20:
-        return "solid";
-      case 21:
-        return "double";
-      case 22:
-        return "dashed";
-      case 23:
-        return "dashed";
-      case 24:
-        return "ridge";
-      case 25:
-        return "grooved";
-      default:
-        return "solid";
-    }
-  }
-  /**
-   * creates the List data
-   *
-   * @param tableStream Main table stream buffer.
-   */
-  private void createListTables(byte[] tableStream)
-  {
-
-
-    int lfoOffset = LittleEndian.getInt(_header, 0x2ea);
-    int lfoSize = LittleEndian.getInt(_header, 0x2ee);
-    byte[] plflfo = new byte[lfoSize];
-
-    System.arraycopy(tableStream, lfoOffset, plflfo, 0, lfoSize);
-
-    int lstOffset = LittleEndian.getInt(_header, 0x2e2);
-    int lstSize = LittleEndian.getInt(_header, 0x2e2);
-    if(lstOffset > 0 && lstSize > 0)
-    {
-      lstSize = lfoOffset - lstOffset;
-      byte[] plcflst = new byte[lstSize];
-      System.arraycopy(tableStream, lstOffset, plcflst, 0, lstSize);
-      _listTables = new ListTables(plcflst, plflfo);
-    }
-
-  }
-  /**
-   * Creates the documents StyleSheet
-   *
-   * @param tableStream Main table stream buffer.
-   *
-   */
-  private void createStyleSheet(byte[] tableStream)
-  {
-      int stshIndex = LittleEndian.getInt(_header, 0xa2);
-      int stshSize = LittleEndian.getInt(_header, 0xa6);
-      byte[] stsh = new byte[stshSize];
-      System.arraycopy(tableStream, stshIndex, stsh, 0, stshSize);
-
-      _styleSheet = new StyleSheet(stsh);
-
-  }
-  /**
-   * creates the Font table
-   *
-   * @param tableStream Main table stream buffer.
-   */
-  private void createFontTable(byte[] tableStream)
-  {
-    int fontTableIndex = LittleEndian.getInt(_header, 0x112);
-    int fontTableSize = LittleEndian.getInt(_header, 0x116);
-    byte[] fontTable = new byte[fontTableSize];
-    System.arraycopy(tableStream, fontTableIndex, fontTable, 0, fontTableSize);
-    _fonts = new FontTable(fontTable);
-  }
-
-
-  private void overrideCellBorder(int row, int col, int height,
-                                  int width, TC tc, TAP tap)
-  {
-
-    if(row == 0)
-    {
-      if(tc._brcTop[0] == 0 || tc._brcTop[0] == -1)
-      {
-        tc._brcTop = tap._brcTop;
-      }
-      if(tc._brcBottom[0] == 0 || tc._brcBottom[0] == -1)
-      {
-        tc._brcBottom = tap._brcHorizontal;
-      }
-    }
-    else if(row == (height - 1))
-    {
-      if(tc._brcTop[0] == 0 || tc._brcTop[0] == -1)
-      {
-        tc._brcTop = tap._brcHorizontal;
-      }
-      if(tc._brcBottom[0] == 0 || tc._brcBottom[0] == -1)
-      {
-        tc._brcBottom = tap._brcBottom;
-      }
-    }
-    else
-    {
-      if(tc._brcTop[0] == 0 || tc._brcTop[0] == -1)
-      {
-        tc._brcTop = tap._brcHorizontal;
-      }
-      if(tc._brcBottom[0] == 0 || tc._brcBottom[0] == -1)
-      {
-        tc._brcBottom = tap._brcHorizontal;
-      }
-    }
-    if(col == 0)
-    {
-      if(tc._brcLeft[0] == 0 || tc._brcLeft[0] == -1)
-      {
-        tc._brcLeft = tap._brcLeft;
-      }
-      if(tc._brcRight[0] == 0 || tc._brcRight[0] == -1)
-      {
-        tc._brcRight = tap._brcVertical;
-      }
-    }
-    else if(col == (width - 1))
-    {
-      if(tc._brcLeft[0] == 0 || tc._brcLeft[0] == -1)
-      {
-        tc._brcLeft = tap._brcVertical;
-      }
-      if(tc._brcRight[0] == 0 || tc._brcRight[0] == -1)
-      {
-        tc._brcRight = tap._brcRight;
-      }
-    }
-    else
-    {
-      if(tc._brcLeft[0] == 0 || tc._brcLeft[0] == -1)
-      {
-        tc._brcLeft = tap._brcVertical;
-      }
-      if(tc._brcRight[0] == 0 || tc._brcRight[0] == -1)
-      {
-        tc._brcRight = tap._brcVertical;
-      }
-    }
-  }
-  private void printTable()
-  {
-    if(_table != null)
-    {
-      int size = _table.size();
-
-      //local buffers for the table
-      StringBuffer tableHeaderBuffer = new StringBuffer();
-      StringBuffer tableBodyBuffer = new StringBuffer();
-
-      for(int x = 0; x < size; x++)
-      {
-        StringBuffer rowBuffer = tableBodyBuffer;
-        TableRow row = _table.get(x);
-        TAP tap = row.getTAP();
-        ArrayList<String> cells = row.getCells();
-
-        if(tap._fTableHeader)
-        {
-          rowBuffer = tableHeaderBuffer;
-        }
-        rowBuffer.append("<fo:table-row ");
-        if(tap._dyaRowHeight > 0)
-        {
-          rowBuffer.append("height=\"" + tap._dyaRowHeight/K_1440_0F + "in\" ");
-        }
-        if(tap._fCantSplit)
-        {
-          rowBuffer.append("keep-together=\"always\" ");
-        }
-        rowBuffer.append(">");
-        //add cells
-        for(int y = 0; y < tap._itcMac; y++)
-        {
-          TC tc = tap._rgtc[y];
-          overrideCellBorder(x, y, size, tap._itcMac, tc, tap);
-          rowBuffer.append("<fo:table-cell ");
-          rowBuffer.append("width=\"" + (tap._rgdxaCenter[y+1] - tap._rgdxaCenter[y])/K_1440_0F + "in\" ");
-          rowBuffer.append("padding-start=\"" + tap._dxaGapHalf/K_1440_0F + "in\" ");
-          rowBuffer.append("padding-end=\"" + tap._dxaGapHalf/K_1440_0F + "in\" ");
-          addBorder(rowBuffer, tc._brcTop, "top");
-          addBorder(rowBuffer, tc._brcLeft, "left");
-          addBorder(rowBuffer, tc._brcBottom, "bottom");
-          addBorder(rowBuffer, tc._brcRight, "right");
-          rowBuffer.append(">");
-          rowBuffer.append(cells.get(y));
-          rowBuffer.append("</fo:table-cell>");
-        }
-        rowBuffer.append("</fo:table-row>");
-      }
-      StringBuffer tableBuffer = new StringBuffer();
-      tableBuffer.append("<fo:table>");
-      if(tableHeaderBuffer.length() > 0)
-      {
-        tableBuffer.append("<fo:table-header>");
-        tableBuffer.append(tableHeaderBuffer.toString());
-        tableBuffer.append("</fo:table-header>");
-      }
-      tableBuffer.append("<fo:table-body>");
-      tableBuffer.append(tableBodyBuffer.toString());
-      tableBuffer.append("</fo:table-body>");
-      tableBuffer.append("</fo:table>");
-      _bodyBuffer.append(tableBuffer.toString());
-      _table = null;
-    }
-  }
-  private void initPclfHdd(byte[] tableStream)
-  {
-    int size = Utils.convertBytesToInt(_header, 0xf6);
-    int pos = Utils.convertBytesToInt(_header, 0xf2);
-
-    _plcfHdd = new byte[size];
-
-    System.arraycopy(tableStream, pos, _plcfHdd, 0, size);
-  }
-
-
-
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
deleted file mode 100644
index 5be8537fa9..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class DOP
-{
-
-  public boolean _fFacingPages;
-  public int _fpc;
-  public int _epc;
-  public int _rncFtn;
-  public int _nFtn;
-  public int _rncEdn;
-  public int _nEdn;
-
-  public DOP()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
deleted file mode 100644
index 81c41b9b53..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LFO
-{
-  int _lsid;
-  int _clfolvl;
-  LFOLVL[] _levels;
-
-  public LFO()
-  {
-
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
deleted file mode 100644
index 7bcceb6367..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LFOLVL
-{
-  int _iStartAt;
-  int _ilvl;
-  boolean _fStartAt;
-  boolean _fFormatting;
-  LVL _override;
-
-  public LFOLVL()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
deleted file mode 100644
index 2332c2a08b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LST
-{
-  int _lsid;
-  int _tplc;
-  byte[] _rgistd = new byte[18];
-  boolean _fSimpleList;
-  LVL[] _levels;
-
-  public LST()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
deleted file mode 100644
index 3b4b8f2e75..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LVL
-{
-  public int _iStartAt;
-  public byte _nfc;
-  byte _jc;
-  boolean _fLegal;
-  boolean _fNoRestart;
-  boolean _fPrev;
-  boolean _fPrevSpace;
-  boolean _fWord6;
-  public byte[] _rgbxchNums = new byte[9];
-  public byte _ixchFollow;
-  public byte[] _chpx;
-  public byte[] _papx;
-  public char[] _xst;
-  public short _istd;
-
-  //byte _cbGrpprlChpx;
-  //byte _cbGrpprlPapx;
-
-
-  public LVL()
-  {
-  }
-  public Object clone()
-  {
-    LVL obj = null;
-    try
-    {
-      obj = (LVL)super.clone();
-    }
-    catch(Exception e)
-    {
-      e.printStackTrace();
-    }
-    return obj;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
deleted file mode 100644
index 0e5fb4ccf5..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.data;
-
-import java.util.*;
-
-import org.apache.poi.hdf.extractor.*;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class ListTables
-{
-
-  LFO[] _pllfo;
-  Hashtable _lists = new Hashtable();
-
-  public ListTables(byte[] plcflst, byte[] plflfo)
-  {
-    initLST(plcflst);
-    initLFO(plflfo);
-  }
-  public LVL getLevel(int list, int level)
-  {
-
-    LFO override = _pllfo[list - 1];
-
-    for(int x = 0; x < override._clfolvl; x++)
-    {
-      if(override._levels[x]._ilvl == level)
-      {
-        LFOLVL lfolvl = override._levels[x];
-        if(lfolvl._fFormatting)
-        {
-          LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-          LVL lvl = lfolvl._override;
-          lvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-          return lvl;
-        }
-        else if(lfolvl._fStartAt)
-        {
-          LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-          LVL lvl = lst._levels[level];
-          LVL newLvl = (LVL)lvl.clone();
-          newLvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-          newLvl._iStartAt = lfolvl._iStartAt;
-          return newLvl;
-        }
-      }
-    }
-
-    LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-    LVL lvl = lst._levels[level];
-    lvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-    return lvl;
-
-
-  }
-  private void initLST(byte[] plcflst)
-  {
-    short length = Utils.convertBytesToShort(plcflst, 0);
-    int nextLevelOffset = 0;
-    //LST[] lstArray = new LST[length];
-    for(int x = 0; x < length; x++)
-    {
-      LST lst = new LST();
-      lst._lsid = Utils.convertBytesToInt(plcflst, 2 + (x * 28));
-      lst._tplc = Utils.convertBytesToInt(plcflst, 2 + 4 + (x * 28));
-      System.arraycopy(plcflst, 2 + 8 + (x * 28), lst._rgistd, 0, 18);
-      byte code = plcflst[2 + 26 + (x * 28)];
-      lst._fSimpleList = StyleSheet.getFlag(code & 0x01);
-      //lstArray[x] = lst;
-      _lists.put(Integer.valueOf(lst._lsid), lst);
-
-      if(lst._fSimpleList)
-      {
-        lst._levels = new LVL[1];
-      }
-      else
-      {
-        lst._levels = new LVL[9];
-      }
-
-      for(int y = 0; y < lst._levels.length; y++)
-      {
-        int offset = 2 + (length * 28) + nextLevelOffset;
-        lst._levels[y] = new LVL();
-        nextLevelOffset += createLVL(plcflst, offset, lst._levels[y]);
-      }
-    }
-
-
-  }
-  private void initLFO(byte[] plflfo)
-  {
-    int lfoSize = Utils.convertBytesToInt(plflfo, 0);
-    _pllfo = new LFO[lfoSize];
-    for(int x = 0; x < lfoSize; x++)
-    {
-      LFO nextLFO = new LFO();
-      nextLFO._lsid = Utils.convertBytesToInt(plflfo, 4 + (x * 16));
-      nextLFO._clfolvl = plflfo[4 + 12 + (x * 16)];
-      nextLFO._levels = new LFOLVL[nextLFO._clfolvl];
-      _pllfo[x] = nextLFO;
-    }
-
-    int lfolvlOffset = (lfoSize * 16) + 4;
-    int lvlOffset = 0;
-    int lfolvlNum = 0;
-    for(int x = 0; x < lfoSize; x++)
-    {
-      for(int y = 0; y < _pllfo[x]._clfolvl; y++)
-      {
-        int offset = lfolvlOffset + (lfolvlNum * 8) + lvlOffset;
-        LFOLVL lfolvl = new LFOLVL();
-        lfolvl._iStartAt = Utils.convertBytesToInt(plflfo, offset);
-        lfolvl._ilvl = Utils.convertBytesToInt(plflfo, offset + 4);
-        lfolvl._fStartAt = StyleSheet.getFlag(lfolvl._ilvl & 0x10);
-        lfolvl._fFormatting = StyleSheet.getFlag(lfolvl._ilvl & 0x20);
-        lfolvl._ilvl = (lfolvl._ilvl & (byte)0x0f);
-        lfolvlNum++;
-
-        if(lfolvl._fFormatting)
-        {
-          offset = lfolvlOffset + (lfolvlNum * 12) + lvlOffset;
-          lfolvl._override = new LVL();
-          lvlOffset += createLVL(plflfo, offset, lfolvl._override);
-        }
-        _pllfo[x]._levels[y] = lfolvl;
-      }
-    }
-  }
-  private int createLVL(byte[] data, int offset, LVL lvl)
-  {
-
-    lvl._iStartAt = Utils.convertBytesToInt(data, offset);
-    lvl._nfc = data[offset + 4];
-    int code = Utils.convertBytesToInt(data, offset + 5);
-    lvl._jc = (byte)(code & 0x03);
-    lvl._fLegal = StyleSheet.getFlag(code & 0x04);
-    lvl._fNoRestart = StyleSheet.getFlag(code & 0x08);
-    lvl._fPrev = StyleSheet.getFlag(code & 0x10);
-    lvl._fPrevSpace = StyleSheet.getFlag(code & 0x20);
-    lvl._fWord6 = StyleSheet.getFlag(code & 0x40);
-    System.arraycopy(data, offset + 6, lvl._rgbxchNums, 0, 9);
-    lvl._ixchFollow = data[offset + 15];
-    int chpxSize = data[offset + 24];
-    int papxSize = data[offset + 25];
-    lvl._chpx = new byte[chpxSize];
-    lvl._papx = new byte[papxSize];
-    System.arraycopy(data, offset + 28, lvl._papx, 0, papxSize);
-    System.arraycopy(data, offset + 28 + papxSize, lvl._chpx, 0, chpxSize);
-    offset += 28 + papxSize + chpxSize;//modify offset
-    int xstSize = Utils.convertBytesToShort(data, offset);
-    lvl._xst = new char[xstSize];
-
-    offset += 2;
-    for(int x = 0; x < xstSize; x++)
-    {
-      lvl._xst[x] = (char)Utils.convertBytesToShort(data, offset + (x * 2));
-    }
-    return 28 + papxSize + chpxSize + 2 + (xstSize * 2);
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
deleted file mode 100644
index 6e4647d2d2..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-import java.util.*;
-
-
-/*
- * A B-Tree like implementation of the java.util.Set inteface.  This is a modifiable set
- * and thus allows elements to be added and removed.  An instance of java.util.Comparator
- * must be provided at construction else all Objects added to the set must implement
- * java.util.Comparable and must be comparable to one another.  No duplicate elements
- * will be allowed in any BTreeSet in accordance with the specifications of the Set interface.
- * Any attempt to add a null element will result in an IllegalArgumentException being thrown.
- * The java.util.Iterator returned by the iterator method guarantees the elements returned
- * are in ascending order.  The Iterator.remove() method is supported.
- * Comment me
- *
- * @author Ryan Ackley
- *
-*/
-@Deprecated
-public final class BTreeSet extends AbstractSet implements Set {
-
-    /*
-     * Instance Variables
-    */
-    public BTreeNode root;
-    private Comparator comparator = null;
-    int order;
-    int size = 0;
-
-    /*
-     *                             Constructors
-     * A no-arg constructor is supported in accordance with the specifications of the
-     * java.util.Collections interface.  If the order for the B-Tree is not specified
-     * at construction it defaults to 32.
-    */
-
-    public BTreeSet() {
-        this(6);           // Default order for a BTreeSet is 32
-    }
-
-    public BTreeSet(Collection c) {
-        this(6);           // Default order for a BTreeSet is 32
-        addAll(c);
-    }
-
-    public BTreeSet(int order) {
-        this(order, null);
-    }
-
-    public BTreeSet(int order, Comparator comparator) {
-        this.order = order;
-        this.comparator = comparator;
-        root = new BTreeNode(null);
-    }
-
-
-    /*
-     * Public Methods
-    */
-    public boolean add(Object x) throws IllegalArgumentException {
-        if (x == null) throw new IllegalArgumentException();
-        return root.insert(x, -1);
-    }
-
-    public boolean contains(Object x) {
-        return root.includes(x);
-    }
-
-    public boolean remove(Object x) {
-        if (x == null) return false;
-        return root.delete(x, -1);
-    }
-
-    public int size() {
-        return size;
-    }
-
-    public void clear() {
-        root = new BTreeNode(null);
-        size = 0;
-    }
-
-    public java.util.Iterator iterator() {
-        return new BTIterator();
-    }
-
-
-    /*
-     * Private methods
-    */
-    int compare(Object x, Object y) {
-        return (comparator == null ? ((Comparable)x).compareTo(y) : comparator.compare(x, y));
-    }
-
-
-
-    /*
-     * Inner Classes
-    */
-
-    /*
-     * Guarantees that the Objects are returned in ascending order.  Due to the volatile
-     * structure of a B-Tree (many splits, steals and merges can happen in a single call to remove)
-     * this Iterator does not attempt to track any concurrent changes that are happening to
-     * it's BTreeSet.  Therefore, after every call to BTreeSet.remove or BTreeSet.add a new
-     * Iterator should be constructed.  If no new Iterator is constructed than there is a
-     * chance of receiving a NullPointerException. The Iterator.delete method is supported.
-    */
-
-    private final class BTIterator implements java.util.Iterator {
-        private int index = 0;
-        Stack parentIndex = new Stack(); // Contains all parentIndicies for currentNode
-        private Object lastReturned = null;
-        private Object next;
-        BTreeNode currentNode;
-
-        BTIterator() {
-            currentNode = firstNode();
-            next = nextElement();
-        }
-
-        public boolean hasNext() {
-            return next != null;
-        }
-
-        public Object next() {
-            if (next == null) throw new NoSuchElementException();
-
-            lastReturned = next;
-            next = nextElement();
-            return lastReturned;
-        }
-
-        public void remove() {
-            if (lastReturned == null) throw new NoSuchElementException();
-
-            BTreeSet.this.remove(lastReturned);
-            lastReturned = null;
-        }
-
-        private BTreeNode firstNode() {
-            BTreeNode temp = BTreeSet.this.root;
-
-            while (temp._entries[0].child != null) {
-                temp = temp._entries[0].child;
-                parentIndex.push(Integer.valueOf(0));
-            }
-
-            return temp;
-        }
-
-        private Object nextElement() {
-            if (currentNode.isLeaf()) {
-                if (index < currentNode._nrElements) return currentNode._entries[index++].element;
-
-                else if (!parentIndex.empty()) { //All elements have been returned, return successor of lastReturned if it exists
-                    currentNode = currentNode._parent;
-                    index = ((Integer)parentIndex.pop()).intValue();
-
-                    while (index == currentNode._nrElements) {
-                        if (parentIndex.empty()) break;
-                        currentNode = currentNode._parent;
-                        index = ((Integer)parentIndex.pop()).intValue();
-                    }
-
-                    if (index == currentNode._nrElements) return null; //Reached root and he has no more children
-                    return currentNode._entries[index++].element;
-                }
-
-                else { //Your a leaf and the root
-                    if (index == currentNode._nrElements) return null;
-                    return currentNode._entries[index++].element;
-                }
-            }
-
-            // else - You're not a leaf so simply find and return the successor of lastReturned
-            currentNode = currentNode._entries[index].child;
-            parentIndex.push(Integer.valueOf(index));
-
-            while (currentNode._entries[0].child != null) {
-                currentNode = currentNode._entries[0].child;
-                parentIndex.push(Integer.valueOf(0));
-            }
-
-            index = 1;
-            return currentNode._entries[0].element;
-        }
-    }
-
-
-    public static class Entry {
-
-        public Object element;
-        public BTreeNode child;
-    }
-
-
-    public class BTreeNode {
-
-        public Entry[] _entries;
-        public BTreeNode _parent;
-        int _nrElements = 0;
-        private final int MIN = (BTreeSet.this.order - 1) / 2;
-
-        BTreeNode(BTreeNode parent) {
-            _parent = parent;
-            _entries = new Entry[BTreeSet.this.order];
-            _entries[0] = new Entry();
-        }
-
-        boolean insert(Object x, int parentIndex) {
-            if (isFull()) { // If full, you must split and promote splitNode before inserting
-                Object splitNode = _entries[_nrElements / 2].element;
-                BTreeNode rightSibling = split();
-
-                if (isRoot()) { // Grow a level
-                    splitRoot(splitNode, this, rightSibling);
-                    // Determine where to insert
-                    if (BTreeSet.this.compare(x, BTreeSet.this.root._entries[0].element) < 0) insert(x, 0);
-                    else rightSibling.insert(x, 1);
-                }
-
-                else { // Promote splitNode
-                    _parent.insertSplitNode(splitNode, this, rightSibling, parentIndex);
-                    if (BTreeSet.this.compare(x, _parent._entries[parentIndex].element) < 0) {
-                        return insert(x, parentIndex);
-                    }
-                    return rightSibling.insert(x, parentIndex + 1);
-                }
-            }
-
-            else if (isLeaf()) { // If leaf, simply insert the non-duplicate element
-                int insertAt = childToInsertAt(x, true);
-                if (insertAt == -1) {
-                    return false; // Determine if the element already exists
-                }
-                insertNewElement(x, insertAt);
-                BTreeSet.this.size++;
-                return true;
-            }
-
-            else { // If not full and not leaf recursively find correct node to insert at
-                int insertAt = childToInsertAt(x, true);
-                return (insertAt == -1 ? false : _entries[insertAt].child.insert(x, insertAt));
-            }
-            return false;
-        }
-
-        boolean includes(Object x) {
-            int index = childToInsertAt(x, true);
-            if (index == -1) return true;
-            if (_entries[index] == null || _entries[index].child == null) return false;
-            return _entries[index].child.includes(x);
-        }
-
-        boolean delete(Object x, int parentIndex) {
-            int i = childToInsertAt(x, true);
-            int priorParentIndex = parentIndex;
-            BTreeNode temp = this;
-            if (i != -1) {
-                do {
-                    if (temp._entries[i] == null || temp._entries[i].child == null) return false;
-                    temp = temp._entries[i].child;
-                    priorParentIndex = parentIndex;
-                    parentIndex = i;
-                    i = temp.childToInsertAt(x, true);
-                } while (i != -1);
-            } // Now temp contains element to delete and temp's parentIndex is parentIndex
-
-            if (temp.isLeaf()) { // If leaf and have more than MIN elements, simply delete
-                if (temp._nrElements > MIN) {
-                    temp.deleteElement(x);
-                    BTreeSet.this.size--;
-                    return true;
-                }
-
-                // else If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
-                temp.prepareForDeletion(parentIndex);
-                temp.deleteElement(x);
-                BTreeSet.this.size--;
-                temp.fixAfterDeletion(priorParentIndex);
-                return true;
-            }
-
-            // else Only delete at leaf so first switch with successor than delete
-            temp.switchWithSuccessor(x);
-            parentIndex = temp.childToInsertAt(x, false) + 1;
-            return temp._entries[parentIndex].child.delete(x, parentIndex);
-        }
-
-
-        private boolean isFull() { return _nrElements == (BTreeSet.this.order - 1); }
-
-        boolean isLeaf() { return _entries[0].child == null; }
-
-        private boolean isRoot() { return _parent == null; }
-
-        /*
-         * Splits a BTreeNode into two BTreeNodes, removing the splitNode from the
-         * calling BTreeNode.
-        */
-        private BTreeNode split() {
-            BTreeNode rightSibling = new BTreeNode(_parent);
-            int index = _nrElements / 2;
-            _entries[index++].element = null;
-
-            for (int i = 0, nr = _nrElements; index <= nr; i++, index++) {
-                rightSibling._entries[i] = _entries[index];
-                if (rightSibling._entries[i] != null && rightSibling._entries[i].child != null)
-                    rightSibling._entries[i].child._parent = rightSibling;
-                _entries[index] = null;
-                _nrElements--;
-                rightSibling._nrElements++;
-            }
-
-            rightSibling._nrElements--; // Need to correct for copying the last Entry which has a null element and a child
-            return rightSibling;
-        }
-
-        /*
-         * Creates a new BTreeSet.root which contains only the splitNode and pointers
-         * to it's left and right child.
-        */
-        private void splitRoot(Object splitNode, BTreeNode left, BTreeNode right) {
-            BTreeNode newRoot = new BTreeNode(null);
-            newRoot._entries[0].element = splitNode;
-            newRoot._entries[0].child = left;
-            newRoot._entries[1] = new Entry();
-            newRoot._entries[1].child = right;
-            newRoot._nrElements = 1;
-            left._parent = right._parent = newRoot;
-            BTreeSet.this.root = newRoot;
-        }
-
-        private void insertSplitNode(Object splitNode, BTreeNode left, BTreeNode right, int insertAt) {
-            for (int i = _nrElements; i >= insertAt; i--) _entries[i + 1] = _entries[i];
-
-            _entries[insertAt] = new Entry();
-            _entries[insertAt].element = splitNode;
-            _entries[insertAt].child = left;
-            _entries[insertAt + 1].child = right;
-
-            _nrElements++;
-        }
-
-        private void insertNewElement(Object x, int insertAt) {
-
-            for (int i = _nrElements; i > insertAt; i--) _entries[i] = _entries[i - 1];
-
-            _entries[insertAt] = new Entry();
-            _entries[insertAt].element = x;
-
-            _nrElements++;
-        }
-
-        /*
-         * Possibly a deceptive name for a pretty cool method.  Uses binary search
-         * to determine the postion in entries[] in which to traverse to find the correct
-         * BTreeNode in which to insert a new element.  If the element exists in the calling
-         * BTreeNode than -1 is returned.  When the parameter position is true and the element
-         * is present in the calling BTreeNode -1 is returned, if position is false and the
-         * element is contained in the calling BTreeNode than the position of the element
-         * in entries[] is returned.
-        */
-        private int childToInsertAt(Object x, boolean position) {
-            int index = _nrElements / 2;
-
-            if (_entries[index] == null || _entries[index].element == null) return index;
-
-            int lo = 0, hi = _nrElements - 1;
-            while (lo <= hi) {
-                if (BTreeSet.this.compare(x, _entries[index].element) > 0) {
-                    lo = index + 1;
-                    index = (hi + lo) / 2;
-                }
-                else {
-                    hi = index - 1;
-                    index = (hi + lo) / 2;
-                }
-            }
-
-            hi++;
-            if (_entries[hi] == null || _entries[hi].element == null) return hi;
-            return (!position ? hi : BTreeSet.this.compare(x, _entries[hi].element) == 0 ? -1 : hi);
-        }
-
-
-        private void deleteElement(Object x) {
-            int index = childToInsertAt(x, false);
-            for (; index < (_nrElements - 1); index++) _entries[index] = _entries[index + 1];
-
-            if (_nrElements == 1) _entries[index] = new Entry(); // This is root and it is empty
-            else _entries[index] = null;
-
-            _nrElements--;
-        }
-
-        private void prepareForDeletion(int parentIndex) {
-            if (isRoot()) return; // Don't attempt to steal or merge if your the root
-
-            // If not root then try to steal left
-            else if (parentIndex != 0 && _parent._entries[parentIndex - 1].child._nrElements > MIN) {
-                stealLeft(parentIndex);
-                return;
-            }
-
-            // If not root and can't steal left try to steal right
-            else if (parentIndex < _entries.length && _parent._entries[parentIndex + 1] != null && _parent._entries[parentIndex + 1].child != null && _parent._entries[parentIndex + 1].child._nrElements > MIN) {
-                    stealRight(parentIndex);
-                    return;
-            }
-
-            // If not root and can't steal left or right then try to merge left
-            else if (parentIndex != 0) {
-                mergeLeft(parentIndex);
-                return;
-            }
-
-            // If not root and can't steal left or right and can't merge left you must be able to merge right
-            else mergeRight(parentIndex);
-        }
-
-        private void fixAfterDeletion(int parentIndex) {
-            if (isRoot() || _parent.isRoot()) return; // No fixing needed
-
-            if (_parent._nrElements < MIN) { // If parent lost it's n/2 element repair it
-                BTreeNode temp = _parent;
-                temp.prepareForDeletion(parentIndex);
-                if (temp._parent == null) return; // Root changed
-                if (!temp._parent.isRoot() && temp._parent._nrElements < MIN) { // If need be recurse
-                    BTreeNode x = temp._parent._parent;
-                    int i = 0;
-                    // Find parent's parentIndex
-                    for (; i < _entries.length; i++) if (x._entries[i].child == temp._parent) break;
-                    temp._parent.fixAfterDeletion(i);
-                }
-            }
-        }
-
-        private void switchWithSuccessor(Object x) {
-            int index = childToInsertAt(x, false);
-            BTreeNode temp = _entries[index + 1].child;
-            while (temp._entries[0] != null && temp._entries[0].child != null) temp = temp._entries[0].child;
-            Object successor = temp._entries[0].element;
-            temp._entries[0].element = _entries[index].element;
-            _entries[index].element = successor;
-        }
-
-        /*
-         * This method is called only when the BTreeNode has the minimum number of elements,
-         * has a leftSibling, and the leftSibling has more than the minimum number of elements.
-        */
-        private void stealLeft(int parentIndex) {
-            BTreeNode p = _parent;
-            BTreeNode ls = _parent._entries[parentIndex - 1].child;
-
-            if (isLeaf()) { // When stealing from leaf to leaf don't worry about children
-                int add = childToInsertAt(p._entries[parentIndex - 1].element, true);
-                insertNewElement(p._entries[parentIndex - 1].element, add);
-                p._entries[parentIndex - 1].element = ls._entries[ls._nrElements - 1].element;
-                ls._entries[ls._nrElements - 1] = null;
-                ls._nrElements--;
-            }
-
-            else { // Was called recursively to fix an undermanned parent
-                _entries[0].element = p._entries[parentIndex - 1].element;
-                p._entries[parentIndex - 1].element = ls._entries[ls._nrElements - 1].element;
-                _entries[0].child = ls._entries[ls._nrElements].child;
-                _entries[0].child._parent = this;
-                ls._entries[ls._nrElements] = null;
-                ls._entries[ls._nrElements - 1].element = null;
-                _nrElements++;
-                ls._nrElements--;
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft can't be called, the BTreeNode
-         * has the minimum number of elements, has a rightSibling, and the rightSibling
-         * has more than the minimum number of elements.
-        */
-        private void stealRight(int parentIndex) {
-            BTreeNode p = _parent;
-            BTreeNode rs = p._entries[parentIndex + 1].child;
-
-            if (isLeaf()) { // When stealing from leaf to leaf don't worry about children
-                _entries[_nrElements] = new Entry();
-                _entries[_nrElements].element = p._entries[parentIndex].element;
-                p._entries[parentIndex].element = rs._entries[0].element;
-                for (int i = 0; i < rs._nrElements; i++) rs._entries[i] = rs._entries[i + 1];
-                rs._entries[rs._nrElements - 1] = null;
-                _nrElements++;
-                rs._nrElements--;
-            }
-
-            else { // Was called recursively to fix an undermanned parent
-                for (int i = 0; i <= _nrElements; i++) _entries[i] = _entries[i + 1];
-                _entries[_nrElements].element = p._entries[parentIndex].element;
-                p._entries[parentIndex].element = rs._entries[0].element;
-                _entries[_nrElements + 1] = new Entry();
-                _entries[_nrElements + 1].child = rs._entries[0].child;
-                _entries[_nrElements + 1].child._parent = this;
-                for (int i = 0; i <= rs._nrElements; i++) rs._entries[i] = rs._entries[i + 1];
-                rs._entries[rs._nrElements] = null;
-                _nrElements++;
-                rs._nrElements--;
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft and stealRight could not be called,
-         * the BTreeNode has the minimum number of elements, has a leftSibling, and the
-         * leftSibling has more than the minimum number of elements.  If after completion
-         * parent has fewer than the minimum number of elements than the parents entries[0]
-         * slot is left empty in anticipation of a recursive call to stealLeft, stealRight,
-         * mergeLeft, or mergeRight to fix the parent. All of the before-mentioned methods
-         * expect the parent to be in such a condition.
-        */
-        private void mergeLeft(int parentIndex) {
-            BTreeNode p = _parent;
-            BTreeNode ls = p._entries[parentIndex - 1].child;
-
-            if (isLeaf()) { // Don't worry about children
-                int add = childToInsertAt(p._entries[parentIndex - 1].element, true);
-                insertNewElement(p._entries[parentIndex - 1].element, add); // Could have been a successor switch
-                p._entries[parentIndex - 1].element = null;
-
-                for (int i = _nrElements - 1, nr = ls._nrElements; i >= 0; i--)
-                    _entries[i + nr] = _entries[i];
-
-                for (int i = ls._nrElements - 1; i >= 0; i--) {
-                    _entries[i] = ls._entries[i];
-                    _nrElements++;
-                }
-
-                if (p._nrElements == MIN && p != BTreeSet.this.root) {
-
-                    for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
-                        p._entries[x] = p._entries[y];
-                    p._entries[0] = new Entry();
-                    p._entries[0].child = ls; //So p doesn't think it's a leaf this will be deleted in the next recursive call
-                }
-
-                else {
-
-                    for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
-                        p._entries[x] = p._entries[y];
-                    p._entries[p._nrElements] = null;
-                }
-
-                p._nrElements--;
-
-                if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
-                    BTreeSet.this.root = this;
-                    _parent = null;
-                }
-            }
-
-            else { // I'm not a leaf but fixing the tree structure
-                _entries[0].element = p._entries[parentIndex - 1].element;
-                _entries[0].child = ls._entries[ls._nrElements].child;
-                _nrElements++;
-
-                for (int x = _nrElements, nr = ls._nrElements; x >= 0; x--)
-                    _entries[x + nr] = _entries[x];
-
-                for (int x = ls._nrElements - 1; x >= 0; x--) {
-                    _entries[x] = ls._entries[x];
-                    _entries[x].child._parent = this;
-                    _nrElements++;
-                }
-
-                if (p._nrElements == MIN && p != BTreeSet.this.root) { // Push everything to the right
-                    for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x++, y++){
-                        System.out.println(x + " " + y);
-                        p._entries[x] = p._entries[y];}
-                    p._entries[0] = new Entry();
-                }
-
-                else { // Either p.nrElements > MIN or p == BTreeSet.this.root so push everything to the left
-                    for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
-                        p._entries[x] = p._entries[y];
-                    p._entries[p._nrElements] = null;
-                }
-
-                p._nrElements--;
-
-                if (p.isRoot() && p._nrElements == 0) { // p == BTreeSet.this.root and it's empty
-                    BTreeSet.this.root = this;
-                    _parent = null;
-                }
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft, stealRight, and mergeLeft could not be called,
-         * the BTreeNode has the minimum number of elements, has a rightSibling, and the
-         * rightSibling has more than the minimum number of elements.  If after completion
-         * parent has fewer than the minimum number of elements than the parents entries[0]
-         * slot is left empty in anticipation of a recursive call to stealLeft, stealRight,
-         * mergeLeft, or mergeRight to fix the parent. All of the before-mentioned methods
-         * expect the parent to be in such a condition.
-        */
-        private void mergeRight(int parentIndex) {
-            BTreeNode p = _parent;
-            BTreeNode rs = p._entries[parentIndex + 1].child;
-
-            if (isLeaf()) { // Don't worry about children
-                _entries[_nrElements] = new Entry();
-                _entries[_nrElements].element = p._entries[parentIndex].element;
-                _nrElements++;
-                for (int i = 0, nr = _nrElements; i < rs._nrElements; i++, nr++) {
-                    _entries[nr] = rs._entries[i];
-                    _nrElements++;
-                }
-                p._entries[parentIndex].element = p._entries[parentIndex + 1].element;
-                if (p._nrElements == MIN && p != BTreeSet.this.root) {
-                    for (int x = parentIndex + 1, y = parentIndex; y >= 0; x--, y--)
-                        p._entries[x] = p._entries[y];
-                    p._entries[0] = new Entry();
-                    p._entries[0].child = rs; // So it doesn't think it's a leaf, this child will be deleted in the next recursive call
-                }
-
-                else {
-                    for (int x = parentIndex + 1, y = parentIndex + 2; y <= p._nrElements; x++, y++)
-                        p._entries[x] = p._entries[y];
-                    p._entries[p._nrElements] = null;
-                }
-
-                p._nrElements--;
-                if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
-                    BTreeSet.this.root = this;
-                    _parent = null;
-                }
-           }
-
-           else { // It's not a leaf
-
-               _entries[_nrElements].element = p._entries[parentIndex].element;
-               _nrElements++;
-
-               for (int x = _nrElements + 1, y = 0; y <= rs._nrElements; x++, y++) {
-                   _entries[x] = rs._entries[y];
-                   rs._entries[y].child._parent = this;
-                   _nrElements++;
-               }
-               _nrElements--;
-
-               p._entries[++parentIndex].child = this;
-
-               if (p._nrElements == MIN && p != BTreeSet.this.root) {
-                  for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
-                      p._entries[x] = p._entries[y];
-                  p._entries[0] = new Entry();
-               }
-
-               else {
-                   for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
-                       p._entries[x] = p._entries[y];
-                   p._entries[p._nrElements] = null;
-               }
-
-               p._nrElements--;
-
-               if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
-                   BTreeSet.this.root = this;
-                   _parent = null;
-               }
-            }
-        }
-  }
-}
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
deleted file mode 100644
index a872906354..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class ChpxNode extends PropertyNode
-{
-
-
-  public ChpxNode(int fcStart, int fcEnd, byte[] chpx)
-  {
-    super(fcStart, fcEnd, chpx);
-  }
-  public byte[] getChpx()
-  {
-    return super.getGrpprl();
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
deleted file mode 100644
index 29ec0d71ce..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-import java.util.Locale;
-
-/**
- * TODO Comment me
- */
-@Deprecated
-public final class NumberFormatter
-{
-  private final static int ARABIC = 0;
-  private final static int UPPER_ROMAN = 1;
-  private final static int LOWER_ROMAN = 2;
-  private final static int UPPER_LETTER = 3;
-  private final static int LOWER_LETTER = 4;
-  private final static int ORDINAL = 5;
-
-  private static String[] _arabic = new String[] {"1", "2", "3", "4", "5", "6",
-                                                  "7", "8", "9", "10", "11", "12",
-                                                  "13", "14", "15", "16", "17", "18",
-                                                  "19", "20", "21", "22", "23",
-                                                  "24", "25", "26", "27", "28",
-                                                  "29", "30", "31", "32", "33",
-                                                  "34", "35", "36", "37", "38",
-                                                  "39", "40", "41", "42", "43",
-                                                  "44", "45", "46", "47", "48",
-                                                  "49", "50", "51", "52", "53"};
-  private static String[] _roman = new String[]{"i", "ii", "iii", "iv", "v", "vi",
-                                                "vii", "viii", "ix", "x", "xi", "xii",
-                                                "xiii","xiv", "xv", "xvi", "xvii",
-                                                "xviii", "xix", "xx", "xxi", "xxii",
-                                                "xxiii", "xxiv", "xxv", "xxvi",
-                                                "xxvii", "xxviii", "xxix", "xxx",
-                                                "xxxi", "xxxii", "xxxiii", "xxxiv",
-                                                "xxxv", "xxxvi", "xxxvii", "xxxvii",
-                                                "xxxviii", "xxxix", "xl", "xli", "xlii",
-                                                "xliii", "xliv", "xlv", "xlvi", "xlvii",
-                                                "xlviii", "xlix", "l"};
-  private static String[] _letter = new String[]{"a", "b", "c", "d", "e", "f", "g",
-                                                 "h", "i", "j", "k", "l", "m", "n",
-                                                 "o", "p", "q", "r", "s", "t", "u",
-                                                 "v", "x", "y", "z"};
-  public NumberFormatter()
-  {
-  }
-  public static String getNumber(int num, int style)
-  {
-    switch(style)
-    {
-      case ARABIC:
-        return _arabic[num - 1];
-      case UPPER_ROMAN:
-        return _roman[num-1].toUpperCase(Locale.ROOT);
-      case LOWER_ROMAN:
-        return _roman[num-1];
-      case UPPER_LETTER:
-        return _letter[num-1].toUpperCase(Locale.ROOT);
-      case LOWER_LETTER:
-        return _letter[num-1];
-      case ORDINAL:
-        return _arabic[num - 1];
-      default:
-        return _arabic[num - 1];
-    }
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
deleted file mode 100644
index b13877e4de..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PapxNode extends PropertyNode
-{
-
-
-  public PapxNode(int fcStart, int fcEnd, byte[] papx)
-  {
-    super(fcStart, fcEnd, papx);
-  }
-  public byte[] getPapx()
-  {
-    return super.getGrpprl();
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
deleted file mode 100644
index 05e35b3b71..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public abstract class PropertyNode implements Comparable {
-  private byte[] _grpprl;
-  private int _fcStart;
-  private int _fcEnd;
-
-  public PropertyNode(int fcStart, int fcEnd, byte[] grpprl)
-  {
-      _fcStart = fcStart;
-      _fcEnd = fcEnd;
-      _grpprl = grpprl;
-  }
-  public int getStart()
-  {
-      return _fcStart;
-  }
-  public int getEnd()
-  {
-    return _fcEnd;
-  }
-  protected byte[] getGrpprl()
-  {
-    return _grpprl;
-  }
-  public int compareTo(Object o)
-  {
-      int fcStart = ((PropertyNode)o).getStart();
-      if(_fcStart == fcStart)
-      {
-        return 0;
-      }
-      else if(_fcStart < fcStart)
-      {
-        return -1;
-      }
-      else
-      {
-        return 1;
-      }
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
deleted file mode 100644
index 76cac5f318..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor.util;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class SepxNode extends PropertyNode
-{
-
-  int _index;
-
-  public SepxNode(int index, int start, int end, byte[] sepx)
-  {
-    super(start, end, sepx);
-  }
-  public byte[] getSepx()
-  {
-    return getGrpprl();
-  }
-
-  public int compareTo(Object obj) {
-      return 0;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
deleted file mode 100644
index 1f7765c234..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   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.hdf.model;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-import org.apache.poi.hdf.event.HDFParsingListener;
-import org.apache.poi.hdf.event.EventBridge;
-
-@Deprecated
-public final class HDFDocument
-{
-
-  HDFObjectModel _model;
-
-
-  public HDFDocument(InputStream in, HDFParsingListener listener) throws IOException
-  {
-    EventBridge eb = new EventBridge(listener);
-    /* HDFObjectFactory factory = */ new HDFObjectFactory(in, eb);
-  }
-  public HDFDocument(InputStream in) throws IOException
-  {
-    _model = new HDFObjectModel();
-    /* HDFObjectFactory factory = */ new HDFObjectFactory(in, _model);
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
deleted file mode 100644
index 4ff9f60d57..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/* ====================================================================
-   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.hdf.model;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hdf.event.HDFLowLevelParsingListener;
-import org.apache.poi.hdf.model.hdftypes.CHPFormattedDiskPage;
-import org.apache.poi.hdf.model.hdftypes.ChpxNode;
-import org.apache.poi.hdf.model.hdftypes.DocumentProperties;
-import org.apache.poi.hdf.model.hdftypes.FileInformationBlock;
-import org.apache.poi.hdf.model.hdftypes.FontTable;
-import org.apache.poi.hdf.model.hdftypes.FormattedDiskPage;
-import org.apache.poi.hdf.model.hdftypes.ListTables;
-import org.apache.poi.hdf.model.hdftypes.PAPFormattedDiskPage;
-import org.apache.poi.hdf.model.hdftypes.PapxNode;
-import org.apache.poi.hdf.model.hdftypes.PlexOfCps;
-import org.apache.poi.hdf.model.hdftypes.SepxNode;
-import org.apache.poi.hdf.model.hdftypes.StyleSheet;
-import org.apache.poi.hdf.model.hdftypes.TextPiece;
-import org.apache.poi.hdf.model.util.ParsingState;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The Object Factory takes in a stream and creates the low level objects
- * that represent the data.
- * @author  andy
- */
-@Deprecated
-public final class HDFObjectFactory {
-
-    /** OLE stuff*/
-    private POIFSFileSystem _filesystem;
-    /** The FIB*/
-    private FileInformationBlock _fib;
-
-    /** Used to set up the object model*/
-    private HDFLowLevelParsingListener _listener;
-    /** parsing state for characters */
-    private ParsingState _charParsingState;
-    /** parsing state for paragraphs */
-    private ParsingState _parParsingState;
-
-    /** main document stream buffer*/
-    byte[] _mainDocument;
-    /** table stream buffer*/
-    byte[] _tableBuffer;
-
-
-    public static void main(String args[]) throws Exception {
-        new HDFObjectFactory(new FileInputStream("c:\\test.doc"));
-    }
-    
-    /** Creates a new instance of HDFObjectFactory
-     *
-     * @param istream The InputStream that is the Word document
-     *
-     */
-    protected HDFObjectFactory(InputStream istream, HDFLowLevelParsingListener l) throws IOException
-    {
-        if (l == null)
-        {
-            _listener = new HDFObjectModel();
-        }
-        else
-        {
-            _listener = l;
-        }
-
-        //do Ole stuff
-        _filesystem = new POIFSFileSystem(istream);
-
-        DocumentEntry headerProps =
-            (DocumentEntry)_filesystem.getRoot().getEntry("WordDocument");
-
-        _mainDocument = new byte[headerProps.getSize()];
-        _filesystem.createDocumentInputStream("WordDocument").read(_mainDocument);
-
-        _fib = new FileInformationBlock(_mainDocument);
-
-        initTableStream();
-        initTextPieces();
-        initFormattingProperties();
-
-
-    }
-
-
-
-
-    /** Creates a new instance of HDFObjectFactory
-     *
-     * @param istream The InputStream that is the Word document
-     *
-     */
-    public HDFObjectFactory(InputStream istream) throws IOException
-    {
-        this(istream, null);
-    }
-
-    public static List<FileInformationBlock> getTypes(InputStream istream) throws IOException
-    {
-        List<FileInformationBlock> results = new ArrayList<FileInformationBlock>(1);
-
-        //do Ole stuff
-        POIFSFileSystem filesystem = null;
-        try {
-            filesystem = new POIFSFileSystem(istream);
-            DocumentEntry headerProps =
-                (DocumentEntry)filesystem.getRoot().getEntry("WordDocument");
-    
-            byte[] mainDocument = new byte[headerProps.getSize()];
-            filesystem.createDocumentInputStream("WordDocument").read(mainDocument);
-    
-            FileInformationBlock fib = new FileInformationBlock(mainDocument);
-    
-    
-            results.add(fib);
-            return results;
-        } finally {
-            if (filesystem != null) filesystem.close();
-        }
-    }
-
-
-    /**
-     * Initializes the table stream
-     *
-     * @throws IOException
-     */
-    private void initTableStream() throws IOException
-    {
-        String tablename = null;
-        if(_fib.isFWhichTblStm())
-        {
-            tablename="1Table";
-        }
-        else
-        {
-          tablename="0Table";
-        }
-
-        DocumentEntry tableEntry = (DocumentEntry)_filesystem.getRoot().getEntry(tablename);
-
-        //load the table stream into a buffer
-        int size = tableEntry.getSize();
-        _tableBuffer = new byte[size];
-        _filesystem.createDocumentInputStream(tablename).read(_tableBuffer);
-    }
-    /**
-     * Initializes the text pieces. Text is divided into pieces because some
-     * "pieces" may only contain unicode characters.
-     *
-     * @throws IOException
-     */
-    private void initTextPieces() throws IOException
-    {
-        int pos = _fib.getFcClx();
-
-        //skips through the prms before we reach the piece table. These contain data
-        //for actual fast saved files
-        while (_tableBuffer[pos] == 1)
-        {
-            pos++;
-            int skip = LittleEndian.getShort(_tableBuffer, pos);
-            pos += 2 + skip;
-        }
-        if(_tableBuffer[pos] != 2)
-        {
-            throw new IOException("The text piece table is corrupted");
-        }
-        //parse out the text pieces
-        int pieceTableSize = LittleEndian.getInt(_tableBuffer, ++pos);
-        pos += 4;
-        int pieces = (pieceTableSize - 4) / 12;
-        for (int x = 0; x < pieces; x++) {
-            int filePos = LittleEndian.getInt(_tableBuffer, pos + ((pieces + 1) * 4) + (x * 8) + 2);
-            boolean unicode = false;
-            if ((filePos & 0x40000000) == 0) {
-                unicode = true;
-            } else {
-                unicode = false;
-                filePos &= ~(0x40000000);//gives me FC in doc stream
-                filePos /= 2;
-            }
-            int totLength = LittleEndian.getInt(_tableBuffer, pos + (x + 1) * 4) -
-                    LittleEndian.getInt(_tableBuffer, pos + (x * 4));
-
-            TextPiece piece = new TextPiece(filePos, totLength, unicode);
-            _listener.text(piece);
-        }
-    }
-    /**
-     * initializes all of the formatting properties for a Word Document
-     */
-    private void initFormattingProperties()
-    {
-        createStyleSheet();
-        createListTables();
-        createFontTable();
-
-        initDocumentProperties();
-        initSectionProperties();
-        //initCharacterProperties();
-        //initParagraphProperties();
-    }
-    private void initCharacterProperties(int charOffset, PlexOfCps charPlcf, int start, int end)
-    {
-        //Initialize paragraph property stuff
-        //int currentCharPage = _charParsingState.getCurrentPage();
-        int charPlcfLen = charPlcf.length();
-        int currentPageIndex = _charParsingState.getCurrentPageIndex();
-        FormattedDiskPage fkp = _charParsingState.getFkp();
-        int currentChpxIndex = _charParsingState.getCurrentPropIndex();
-        int currentArraySize = fkp.size();
-
-        //get the character runs for this paragraph
-        int charStart = 0;
-        int charEnd = 0;
-        //add the character runs
-        do
-        {
-          if (currentChpxIndex < currentArraySize)
-          {
-            charStart = fkp.getStart(currentChpxIndex);
-            charEnd = fkp.getEnd(currentChpxIndex);
-            byte[] chpx = fkp.getGrpprl(currentChpxIndex);
-            _listener.characterRun(new ChpxNode(Math.max(charStart, start),  Math.min(charEnd, end), chpx));
-
-            if (charEnd < end)
-            {
-              currentChpxIndex++;
-            }
-            else
-            {
-              _charParsingState.setState(currentPageIndex, fkp, currentChpxIndex);
-              break;
-            }
-          }
-          else
-          {
-            int currentCharPage = LittleEndian.getInt(_tableBuffer, charOffset + charPlcf.getStructOffset(++currentPageIndex));
-            byte[] byteFkp = new byte[512];
-            System.arraycopy(_mainDocument, (currentCharPage * 512), byteFkp, 0, 512);
-            fkp = new CHPFormattedDiskPage(byteFkp);
-            currentChpxIndex = 0;
-            currentArraySize = fkp.size();
-          }
-        }
-        while(currentPageIndex < charPlcfLen);
-    }
-    private void initParagraphProperties(int parOffset, PlexOfCps parPlcf, int charOffset, PlexOfCps charPlcf, int start, int end)
-    {
-        //Initialize paragraph property stuff
-        //int currentParPage = _parParsingState.getCurrentPage();
-        int parPlcfLen = parPlcf.length();
-        int currentPageIndex = _parParsingState.getCurrentPageIndex();
-        FormattedDiskPage fkp = _parParsingState.getFkp();
-        int currentPapxIndex = _parParsingState.getCurrentPropIndex();
-        int currentArraySize = fkp.size();
-
-        do
-        {
-          if (currentPapxIndex < currentArraySize)
-          {
-            int parStart = fkp.getStart(currentPapxIndex);
-            int parEnd = fkp.getEnd(currentPapxIndex);
-            byte[] papx = fkp.getGrpprl(currentPapxIndex);
-            _listener.paragraph(new PapxNode(Math.max(parStart, start), Math.min(parEnd, end), papx));
-            initCharacterProperties(charOffset, charPlcf, Math.max(start, parStart), Math.min(parEnd, end));
-            if (parEnd < end)
-            {
-              currentPapxIndex++;
-            }
-            else
-            {
-              //save the state
-              _parParsingState.setState(currentPageIndex, fkp, currentPapxIndex);
-              break;
-            }
-          }
-          else
-          {
-            int currentParPage = LittleEndian.getInt(_tableBuffer, parOffset + parPlcf.getStructOffset(++currentPageIndex));
-            byte byteFkp[] = new byte[512];
-            System.arraycopy(_mainDocument, (currentParPage * 512), byteFkp, 0, 512);
-            fkp = new PAPFormattedDiskPage(byteFkp);
-            currentPapxIndex = 0;
-            currentArraySize = fkp.size();
-          }
-        }
-        while(currentPageIndex < parPlcfLen);
-    }
-    /**
-     * initializes the CharacterProperties BTree
-     */
-    /*private void initCharacterProperties()
-    {
-        int charOffset = _fib.getFcPlcfbteChpx();
-        int charPlcSize = _fib.getLcbPlcfbteChpx();
-
-        //int arraySize = (charPlcSize - 4)/8;
-
-        //first we must go through the bin table and find the fkps
-        for(int x = 0; x < arraySize; x++)
-        {
-
-            //get page number(has nothing to do with document page)
-            //containing the chpx for the paragraph
-            int PN = LittleEndian.getInt(_tableBuffer, charOffset + (4 * (arraySize + 1) + (4 * x)));
-
-            byte[] fkp = new byte[512];
-            System.arraycopy(_mainDocument, (PN * 512), fkp, 0, 512);
-            //take each fkp and get the chpxs
-            int crun = LittleEndian.getUnsignedByte(fkp, 511);
-            for(int y = 0; y < crun; y++)
-            {
-                //get the beginning fc of each paragraph text run
-                int fcStart = LittleEndian.getInt(fkp, y * 4);
-                int fcEnd = LittleEndian.getInt(fkp, (y+1) * 4);
-                //get the offset in fkp of the papx for this paragraph
-                int chpxOffset = 2 * LittleEndian.getUnsignedByte(fkp, ((crun + 1) * 4) + y);
-
-                //optimization if offset == 0 use "Normal" style
-                if(chpxOffset == 0)
-
-                {
-                    _characterRuns.add(new ChpxNode(fcStart, fcEnd, new byte[0]));
-                    continue;
-                }
-
-                int size = LittleEndian.getUnsignedByte(fkp, chpxOffset);
-
-                byte[] chpx = new byte[size];
-                System.arraycopy(fkp, ++chpxOffset, chpx, 0, size);
-                //_papTable.put(Integer.valueOf(fcStart), papx);
-                _characterRuns.add(new ChpxNode(fcStart, fcEnd, chpx));
-            }
-
-        }
-    }*/
-    /**
-     * intializes the Paragraph Properties BTree
-     */
-    @SuppressWarnings("unused")
-    private void initParagraphProperties()
-    {
-        //paragraphs
-        int parOffset = _fib.getFcPlcfbtePapx();
-        int parPlcSize = _fib.getLcbPlcfbtePapx();
-
-        //characters
-        int charOffset = _fib.getFcPlcfbteChpx();
-        int charPlcSize = _fib.getLcbPlcfbteChpx();
-
-        PlexOfCps charPlcf = new PlexOfCps(charPlcSize, 4);
-        PlexOfCps parPlcf = new PlexOfCps(parPlcSize, 4);
-
-        //Initialize character property stuff
-        int currentCharPage = LittleEndian.getInt(_tableBuffer, charOffset + charPlcf.getStructOffset(0));
-        int charPlcfLen = charPlcf.length();
-        int currentPageIndex = 0;
-        byte[] fkp = new byte[512];
-        System.arraycopy(_mainDocument, (currentCharPage * 512), fkp, 0, 512);
-        CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(fkp);
-        int currentChpxIndex = 0;
-        int currentArraySize = cfkp.size();
-
-
-        int arraySize = parPlcf.length();
-
-        //first we must go through the bin table and find the fkps
-        for(int x = 0; x < arraySize; x++)
-        {
-            int PN = LittleEndian.getInt(_tableBuffer, parOffset + parPlcf.getStructOffset(x));
-
-            fkp = new byte[512];
-            System.arraycopy(_mainDocument, (PN * 512), fkp, 0, 512);
-
-            PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(fkp);
-            //take each fkp and get the paps
-            int crun = pfkp.size();
-            for(int y = 0; y < crun; y++)
-            {
-                //get the beginning fc of each paragraph text run
-                int fcStart = pfkp.getStart(y);
-                int fcEnd = pfkp.getEnd(y);
-
-                //get the papx for this paragraph
-                byte[] papx = pfkp.getGrpprl(y);
-
-                _listener.paragraph(new PapxNode(fcStart, fcEnd, papx));
-
-                //get the character runs for this paragraph
-                int charStart = 0;
-                int charEnd = 0;
-                //add the character runs
-                do
-                {
-                  if (currentChpxIndex < currentArraySize)
-                  {
-                    charStart = cfkp.getStart(currentChpxIndex);
-                    charEnd = cfkp.getEnd(currentChpxIndex);
-                    byte[] chpx = cfkp.getGrpprl(currentChpxIndex);
-                    _listener.characterRun(new ChpxNode(charStart, charEnd, chpx));
-                    if (charEnd < fcEnd)
-                    {
-                      currentChpxIndex++;
-                    }
-                    else
-                    {
-                      break;
-                    }
-                  }
-                  else
-                  {
-                    currentCharPage = LittleEndian.getInt(_tableBuffer, charOffset + charPlcf.getStructOffset(++currentPageIndex));
-                    fkp = new byte[512];
-                    System.arraycopy(_mainDocument, (currentCharPage * 512), fkp, 0, 512);
-                    cfkp = new CHPFormattedDiskPage(fkp);
-                    currentChpxIndex = 0;
-                    currentArraySize = cfkp.size();
-                  }
-                }
-                while(currentCharPage <= charPlcfLen + 1);
-
-            }
-
-        }
-
-    }
-    private void initParsingStates(int parOffset, PlexOfCps parPlcf, int charOffset, PlexOfCps charPlcf)
-    {
-        int currentCharPage = LittleEndian.getInt(_tableBuffer, charOffset + charPlcf.getStructOffset(0));
-        byte[] fkp = new byte[512];
-        System.arraycopy(_mainDocument, (currentCharPage * 512), fkp, 0, 512);
-        CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(fkp);
-        _charParsingState = new ParsingState(currentCharPage, cfkp);
-
-        int currentParPage = LittleEndian.getInt(_tableBuffer, parOffset + parPlcf.getStructOffset(0));
-        fkp = new byte[512];
-        System.arraycopy(_mainDocument, (currentParPage * 512), fkp, 0, 512);
-        PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(fkp);
-        _parParsingState = new ParsingState(currentParPage, pfkp);
-    }
-    /**
-     * initializes the SectionProperties BTree
-     */
-    @SuppressWarnings("unused")
-    private void initSectionProperties()
-    {
-
-      int ccpText = _fib.getCcpText();
-      // int ccpFtn = _fib.getCcpFtn();
-
-      //sections
-      int fcMin = _fib.getFcMin();
-      int plcfsedFC = _fib.getFcPlcfsed();
-      int plcfsedSize = _fib.getLcbPlcfsed();
-
-      //paragraphs
-      int parOffset = _fib.getFcPlcfbtePapx();
-      int parPlcSize = _fib.getLcbPlcfbtePapx();
-
-      //characters
-      int charOffset = _fib.getFcPlcfbteChpx();
-      int charPlcSize = _fib.getLcbPlcfbteChpx();
-
-      PlexOfCps charPlcf = new PlexOfCps(charPlcSize, 4);
-      PlexOfCps parPlcf = new PlexOfCps(parPlcSize, 4);
-
-      initParsingStates(parOffset, parPlcf, charOffset, charPlcf);
-
-      //byte[] plcfsed = new byte[plcfsedSize];
-      //System.arraycopy(_tableBuffer, plcfsedFC, plcfsed, 0, plcfsedSize);
-
-      PlexOfCps plcfsed = new PlexOfCps(plcfsedSize, 12);
-      int arraySize = plcfsed.length();
-
-      int start = fcMin;
-      int end = fcMin + ccpText;
-      int x = 0;
-      int sectionEnd = 0;
-
-      //do the main body sections
-      while (x < arraySize)
-      {
-          int sectionStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x)) + fcMin;
-          sectionEnd = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x + 1)) + fcMin;
-          int sepxStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getStructOffset(x) + 2);
-          int sepxSize = LittleEndian.getShort(_mainDocument, sepxStart);
-
-          byte[] sepx = new byte[sepxSize];
-          System.arraycopy(_mainDocument, sepxStart + 2, sepx, 0, sepxSize);
-          SepxNode node = new SepxNode(x + 1, sectionStart, sectionEnd, sepx);
-          _listener.bodySection(node);
-          initParagraphProperties(parOffset, parPlcf, charOffset, charPlcf, sectionStart, Math.min(end, sectionEnd));
-
-          if (sectionEnd > end)
-          {
-            break;
-          }
-          x++;
-      }
-      //do the header sections
-      for (; x < arraySize; x++)// && sectionEnd <= end; x++)
-      {
-          int sectionStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x)) + fcMin;
-          sectionEnd = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x + 1)) + fcMin;
-          int sepxStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getStructOffset(x) + 2);
-          int sepxSize = LittleEndian.getShort(_mainDocument, sepxStart);
-
-          byte[] sepx = new byte[sepxSize];
-          System.arraycopy(_mainDocument, sepxStart + 2, sepx, 0, sepxSize);
-          SepxNode node = new SepxNode(x + 1, sectionStart, sectionEnd, sepx);
-          _listener.hdrSection(node);
-          initParagraphProperties(parOffset, parPlcf, charOffset, charPlcf, Math.max(sectionStart, end), sectionEnd);
-
-      }
-      _listener.endSections();
-    }
-    /**
-     * Initializes the DocumentProperties object unique to this document.
-     */
-    private void initDocumentProperties()
-    {
-        int pos = _fib.getFcDop();
-        int size = _fib.getLcbDop();
-        byte[] dopArray = new byte[size];
-
-        System.arraycopy(_tableBuffer, pos, dopArray, 0, size);
-        _listener.document(new DocumentProperties(dopArray));
-    }
-    /**
-     * Uncompresses the StyleSheet from file into memory.
-     */
-    private void createStyleSheet()
-    {
-      int stshIndex = _fib.getFcStshf();
-      int stshSize = _fib.getLcbStshf();
-      byte[] stsh = new byte[stshSize];
-      System.arraycopy(_tableBuffer, stshIndex, stsh, 0, stshSize);
-
-      _listener.styleSheet(new StyleSheet(stsh));
-    }
-    /**
-     * Initializes the list tables for this document
-     */
-    private void createListTables()
-    {
-        int lfoOffset = _fib.getFcPlfLfo();
-        int lfoSize = _fib.getLcbPlfLfo();
-        byte[] plflfo = new byte[lfoSize];
-
-        System.arraycopy(_tableBuffer, lfoOffset, plflfo, 0, lfoSize);
-
-        int lstOffset = _fib.getFcPlcfLst();
-        int lstSize = _fib.getLcbPlcfLst();
-        if (lstOffset > 0 && lstSize > 0)
-        {
-          //  The lstSize returned by _fib.getLcbPlcfLst() doesn't appear
-          //  to take into account any LVLs.  Therefore, we recalculate
-          //  lstSize based on where the LFO section begins (because the
-          //  LFO section immediately follows the LST section).
-          lstSize = lfoOffset - lstOffset;
-          byte[] plcflst = new byte[lstSize];
-          System.arraycopy(_tableBuffer, lstOffset, plcflst, 0, lstSize);
-          _listener.lists(new ListTables(plcflst, plflfo));
-        }
-    }
-    /**
-     * Initializes this document's FontTable;
-     */
-    private void createFontTable()
-    {
-        int fontTableIndex = _fib.getFcSttbfffn();
-        int fontTableSize = _fib.getLcbSttbfffn();
-        byte[] fontTable = new byte[fontTableSize];
-        System.arraycopy(_tableBuffer, fontTableIndex, fontTable, 0, fontTableSize);
-        _listener.fonts(new FontTable(fontTable));
-    }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
deleted file mode 100644
index d6bba0d6e7..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   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.hdf.model;
-
-import org.apache.poi.hdf.event.HDFLowLevelParsingListener;
-import org.apache.poi.hdf.model.util.BTreeSet;
-
-import org.apache.poi.hdf.model.hdftypes.ChpxNode;
-import org.apache.poi.hdf.model.hdftypes.PapxNode;
-import org.apache.poi.hdf.model.hdftypes.SepxNode;
-import org.apache.poi.hdf.model.hdftypes.TextPiece;
-import org.apache.poi.hdf.model.hdftypes.DocumentProperties;
-import org.apache.poi.hdf.model.hdftypes.FontTable;
-import org.apache.poi.hdf.model.hdftypes.ListTables;
-import org.apache.poi.hdf.model.hdftypes.StyleSheet;
-
-
-@Deprecated
-public final class HDFObjectModel implements HDFLowLevelParsingListener
-{
-
-    /** "WordDocument" from the POIFS */
-    private byte[] _mainDocument;
-
-    /** The DOP*/
-    private DocumentProperties _dop;
-    /**the StyleSheet*/
-    private StyleSheet _styleSheet;
-    /**list info */
-    private ListTables _listTables;
-    /** Font info */
-    private FontTable _fonts;
-
-    /** text offset in main stream */
-    int _fcMin;
-
-    /** text pieces */
-    BTreeSet _text = new BTreeSet();
-    /** document sections */
-    BTreeSet _sections = new BTreeSet();
-    /** document paragraphs */
-    BTreeSet _paragraphs = new BTreeSet();
-    /** document character runs */
-    BTreeSet _characterRuns = new BTreeSet();
-
-    public HDFObjectModel()
-    {
-    }
-    public void mainDocument(byte[] mainDocument)
-    {
-      _mainDocument = mainDocument;
-    }
-    public void tableStream(byte[] tableStream)
-    {
-    }
-    public void miscellaneous(int fcMin, int ccpText, int ccpFtn, int fcPlcfhdd, int lcbPlcfhdd)
-    {
-      _fcMin = fcMin;
-    }
-    public void document(DocumentProperties dop)
-    {
-      _dop = dop;
-    }
-    public void bodySection(SepxNode sepx)
-    {
-      _sections.add(sepx);
-    }
-    public void hdrSection(SepxNode sepx)
-    {
-      _sections.add(sepx);
-    }
-    public void endSections()
-    {
-    }
-    public void paragraph(PapxNode papx)
-    {
-      _paragraphs.add(papx);
-    }
-    public void characterRun(ChpxNode chpx)
-    {
-      _characterRuns.add(chpx);
-    }
-    public void text(TextPiece t)
-    {
-      _text.add(t);
-    }
-    public void fonts(FontTable fontTbl)
-    {
-      _fonts = fontTbl;
-    }
-    public void lists(ListTables listTbl)
-    {
-      _listTables = listTbl;
-    }
-    public void styleSheet(StyleSheet stsh)
-    {
-      _styleSheet = stsh;
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
deleted file mode 100644
index 8141705e61..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a CHP fkp. The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets that represent a
- * Paragraph's or Character run's text offset in the main stream. The ending
- * offset is the next value in the array. For example, if an fkp has X number of
- * Paragraph's stored in it then there are (x + 1) 4 byte ints in the beginning
- * array. The number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class CHPFormattedDiskPage extends FormattedDiskPage
-{
-
-
-    /**
-     * This constructs a CHPFormattedDiskPage from a raw fkp (512 byte array
-     * read from a Word file).
-     *
-     * @param fkp The 512 byte array to read data from
-     */
-    public CHPFormattedDiskPage(byte[] fkp)
-    {
-        super(fkp);
-    }
-
-    /**
-     * Gets the chpx for the character run at index in this fkp.
-     *
-     * @param index The index of the chpx to get.
-     * @return a chpx grpprl.
-     */
-    public byte[] getGrpprl(int index)
-    {
-        int chpxOffset = 2 * LittleEndian.getUnsignedByte(_fkp, ((_crun + 1) * 4) + index);
-
-        //optimization if offset == 0 use "Normal" style
-        if(chpxOffset == 0)
-        {
-            return new byte[0];
-
-        }
-
-        int size = LittleEndian.getUnsignedByte(_fkp, chpxOffset);
-
-        byte[] chpx = new byte[size];
-
-        System.arraycopy(_fkp, ++chpxOffset, chpx, 0, size);
-        return chpx;
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
deleted file mode 100644
index 6cd868c4dc..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.hdf.model.hdftypes.definitions.CHPAbstractType;
-/**
- * Properties for character runs.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class CharacterProperties extends CHPAbstractType implements Cloneable
-{
-
-  public CharacterProperties()
-  {
-    setDttmRMark(new short[2]);
-    setDttmRMarkDel(new short[2]);
-    setXstDispFldRMark(new byte[32]);
-    setBrc(new short[2]);;
-    setHps(20);
-    setFcPic(-1);
-    setIstd(10);
-    setLidFE(0x0400);
-    setLidDefault(0x0400);
-    setWCharScale(100);
-    //setFUsePgsuSettings(-1);
-  }
-  /**
-   * Used to make a deep copy of this object.
-   */
-  public Object clone() throws CloneNotSupportedException
-  {
-    CharacterProperties clone = (CharacterProperties)super.clone();
-    clone.setBrc(new short[2]);
-    System.arraycopy(getBrc(), 0, clone.getBrc(), 0, 2);
-    System.arraycopy(getDttmRMark(), 0, clone.getDttmRMark(), 0, 2);
-    System.arraycopy(getDttmRMarkDel(), 0, clone.getDttmRMarkDel(), 0, 2);
-    System.arraycopy(getXstDispFldRMark(), 0, clone.getXstDispFldRMark(), 0, 32);
-    return clone;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
deleted file mode 100644
index 94de02806c..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class ChpxNode extends PropertyNode
-{
-
-
-  public ChpxNode(int fcStart, int fcEnd, byte[] chpx)
-  {
-    super(fcStart, fcEnd, chpx);
-  }
-  public byte[] getChpx()
-  {
-    return super.getGrpprl();
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
deleted file mode 100644
index 0a21beba6f..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class DocumentProperties implements HDFType
-{
-
-  public boolean _fFacingPages;
-  public int _fpc;
-  public int _epc;
-  public int _rncFtn;
-  public int _nFtn;
-  public int _rncEdn;
-  public int _nEdn;
-
-  public DocumentProperties(byte[] dopArray)
-  {
-        _fFacingPages = (dopArray[0] & 0x1) > 0;
-        _fpc = (dopArray[0] & 0x60) >> 5;
-
-        short num = LittleEndian.getShort(dopArray, 2);
-        _rncFtn = (num & 0x3);
-        _nFtn = (short)(num & 0xfffc) >> 2;
-        num = LittleEndian.getShort(dopArray, 52);
-        _rncEdn = num & 0x3;
-        _nEdn = (short)(num & 0xfffc) >> 2;
-        num = LittleEndian.getShort(dopArray, 54);
-        _epc = num & 0x3;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
deleted file mode 100644
index 74ad9a20c1..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-
-import org.apache.poi.hdf.model.hdftypes.definitions.FIBAbstractType;
-
-/**
- *
- * @author  andy
- */
-@Deprecated
-public final class FileInformationBlock extends FIBAbstractType
-{
-/*
-    private  short field_1_id;
-    private  short field_2_version; // 101 = Word 6.0 +
-    private  short field_3_product_version;
-    private  short field_4_language_stamp;
-    private  short field_5_unknown;
-    private  short field_6_options;
-
-        private static final BitField template          = BitFieldFactory.getInstance(0x0001);
-        private static final BitField glossary          = BitFieldFactory.getInstance(0x0002);
-        private static final BitField quicksave         = BitFieldFactory.getInstance(0x0004);
-        private static final BitField haspictr          = BitFieldFactory.getInstance(0x0008);
-        private static final BitField nquicksaves       = BitFieldFactory.getInstance(0x00F0);
-        private static final BitField encrypted         = BitFieldFactory.getInstance(0x0100);
-        private static final BitField tabletype         = BitFieldFactory.getInstance(0x0200);
-        private static final BitField readonly          = BitFieldFactory.getInstance(0x0400);
-        private static final BitField writeReservation  = BitFieldFactory.getInstance(0x0800);
-        private static final BitField extendedCharacter = BitFieldFactory.getInstance(0x1000);
-        private static final BitField loadOverride      = BitFieldFactory.getInstance(0x2000);
-        private static final BitField farEast           = BitFieldFactory.getInstance(0x4000);
-        private static final BitField crypto            = BitFieldFactory.getInstance(0x8000);
-
-    private short field_7_minversion;
-    private short field_8_encrypted_key;
-    private short field_9_environment; // 0 or 1 - windows or mac
-    private short field_10_history;
-
-        private static final BitField history_mac   = BitFieldFactory.getInstance(0x01);
-        private static final BitField empty_special = BitFieldFactory.getInstance(0x02);
-        private static final BitField load_override = BitFieldFactory.getInstance(0x04);
-        private static final BitField future_undo   = BitFieldFactory.getInstance(0x08);
-        private static final BitField w97_saved     = BitFieldFactory.getInstance(0x10);
-        private static final BitField spare         = BitFieldFactory.getInstance(0xfe);
-
-    private short field_11_default_charset;
-    private short field_12_default_extcharset;
-    private int  field_13_offset_first_char;
-    private int  field_14_offset_last_char;
-    private short field_15_count_shorts;
-
-    private short field_16_beg_shorts; //why same offset?
-
-    private short field_16_creator_id;
-    private short field_17_revisor_id;
-    private short field_18_creator_private;
-    private short field_19_revisor_private;
-
-    private short field_20_unused;
-    private short field_21_unused;
-    private short field_22_unused;
-    private short field_23_unused;
-    private short field_24_unused;
-    private short field_25_unused;
-    private short field_26_unused;
-    private short field_27_unused;
-    private short field_28_unused;
-
-    private short field_29_fareastid;
-    private short field_30_count_ints;
-
-    private int field_31_beg_ints; //why same offset?
-
-    private int field_31_last_byte;
-
-    private int field_32_creator_build_date;
-    private int field_33_revisor_build_date; */
-    /** length of main document text stream*/
-//    private int field_34_main_streamlen;
-    /**length of footnote subdocument text stream*/
-/*    private int field_35_footnote_streamlen;
-    private int field_36_header_streamlen;
-    private int field_37_macro_streamlen;
-    private int field_38_annotation_streamlen;
-    private int field_39_endnote_streamlen;
-    private int field_40_textbox_streamlen;
-    private int field_41_headbox_streamlen; */
-    /**offset in table stream of character property bin table*/
-//    private int field_42_pointer_to_plc_list_chp; //rename me!
-//    private int field_43_first_chp; //rename me
-//    private int field_44_count_chps; //rename me
-    /**offset in table stream of paragraph property bin */
- /*   private int field_45_pointer_to_plc_list_pap; //rename me.
-    private int field_46_first_pap; //rename me
-    private int field_47_count_paps; //rename me
-    private int field_48_pointer_to_plc_list_lvc; //rename me
-    private int field_49_first_lvc; //rename me
-    private int field_50_count_lvc; //rename me
-
-    private int field_51_unknown;
-    private int field_52_unknown; */
-    //not sure about this array.
-/*
-    private short field_53_fc_lcb_array_size;
-    private int field_54_original_stylesheet_offset;
-    private int field_55_original_stylesheet_size;
-    private int field_56_stylesheet_offset;
-    private int field_57_stylesheet_size;
-    private int field_58_footnote_ref_offset;
-    private int field_59_footnote_ref_size;
-    private int field_60_footnote_plc_offset;
-    private int field_61_footnote_plc_size;
-    private int field_62_annotation_ref_offset;
-    private int field_63_annotation_ref_size;
-    private int field_64_annotation_plc_offset;
-    private int field_65_annotation_plc_size; */
-    /** offset in table stream of section descriptor SED PLC*/
-/*    private int field_66_section_plc_offset;
-    private int field_67_section_plc_size;
-    private int field_68_unused;
-    private int field_69_unused;
-    private int field_70_pheplc_offset;
-    private int field_71_pheplc_size;
-    private int field_72_glossaryST_offset;
-    private int field_73_glossaryST_size;
-    private int field_74_glossaryPLC_offset;
-    private int field_75_glossaryPLC_size;
-    private int field_76_headerPLC_offset;
-    private int field_77_headerPLC_size;
-    private int field_78_chp_bin_table_offset;
-    private int field_79_chp_bin_table_size;
-    private int field_80_pap_bin_table_offset;
-    private int field_81_pap_bin_table_size;
-    private int field_82_sea_plc_offset;
-    private int field_83_sea_plc_size;
-    private int field_84_fonts_offset;
-    private int field_85_fonts_size;
-    private int field_86_main_fields_offset;
-    private int field_87_main_fields_size;
-    private int field_88_header_fields_offset;
-    private int field_89_header_fields_size;
-    private int field_90_footnote_fields_offset;
-    private int field_91_footnote_fields_size;
-    private int field_92_ann_fields_offset;
-    private int field_93_ann_fields_size;
-    private int field_94_unused;
-    private int field_95_unused;
-    private int field_96_bookmark_names_offset;
-    private int field_97_bookmark_names_size;
-    private int field_98_bookmark_offsets_offset;
-    private int field_99_bookmark_offsets_size;
-    private int field_100_macros_offset;
-    private int field_101_macros_size;
-    private int field_102_unused;
-    private int field_103_unused;
-    private int field_104_unused;
-    private int field_105_unused;
-    private int field_106_printer_offset;
-    private int field_107_printer_size;
-    private int field_108_printer_portrait_offset;
-    private int field_109_printer_portrait_size;
-    private int field_110_printer_landscape_offset;
-    private int field_111_printer_landscape_size;
-    private int field_112_wss_offset;
-    private int field_113_wss_size;
-    private int field_114_DOP_offset;
-    private int field_115_DOP_size;
-    private int field_116_sttbfassoc_offset;
-    private int field_117_sttbfassoc_size; */
-    /**offset in table stream of beginning of information for complex files.
-     * Also, this is the beginning of the Text piece table*/ /*
-    private int field_118_textPieceTable_offset;
-    private int field_119_textPieceTable_size;
-    private int field_199_list_format_offset;
-    private int field_200_list_format_size;
-    private int field_201_list_format_override_offset;
-    private int field_202_list_format_override_size;
-
-
-
-
-^/
-    /** Creates a new instance of FileInformationBlock */
-    public FileInformationBlock(byte[] mainDocument)
-    {
-        fillFields(mainDocument, (short)0, (short)0);
-/*        field_1_id = LittleEndian.getShort(mainDocument, 0);
-        field_2_version = LittleEndian.getShort(mainDocument, 0x2); // 101 = Word 6.0 +
-        field_3_product_version = LittleEndian.getShort(mainDocument, 0x4);
-        field_4_language_stamp = LittleEndian.getShort(mainDocument, 0x6);
-        field_5_unknown = LittleEndian.getShort(mainDocument, 0x8);
-        field_6_options = LittleEndian.getShort(mainDocument, 0xa);
-
-
-
-        field_13_offset_first_char = LittleEndian.getInt(mainDocument, 0x18);
-        field_34_main_streamlen = LittleEndian.getInt(mainDocument, 0x4c);
-        field_35_footnote_streamlen = LittleEndian.getInt(mainDocument, 0x50);
-
-        field_56_stylesheet_offset = LittleEndian.getInt(mainDocument, 0xa2);
-        field_57_stylesheet_size = LittleEndian.getInt(mainDocument, 0xa6);
-        field_66_section_plc_offset = LittleEndian.getInt(mainDocument, 0xca);
-        field_67_section_plc_size = LittleEndian.getInt(mainDocument, 0xce);
-
-        field_78_chp_bin_table_offset = LittleEndian.getInt(mainDocument, 0xfa);
-        field_79_chp_bin_table_size = LittleEndian.getInt(mainDocument, 0xfe);
-        field_80_pap_bin_table_offset = LittleEndian.getInt(mainDocument, 0x102);
-        field_81_pap_bin_table_size = LittleEndian.getInt(mainDocument, 0x106);
-
-        field_84_fonts_offset = LittleEndian.getInt(mainDocument, 0x112);
-        field_85_fonts_size = LittleEndian.getInt(mainDocument, 0x116);
-
-        field_114_DOP_offset = LittleEndian.getInt(mainDocument, 0x192);
-        field_115_DOP_size = LittleEndian.getInt(mainDocument, 0x196);
-        field_118_textPieceTable_offset = LittleEndian.getInt(mainDocument, 0x1a2);
-
-        field_199_list_format_offset = LittleEndian.getInt(mainDocument, 0x2e2);
-        field_200_list_format_size = LittleEndian.getInt(mainDocument, 0x2e6);
-        field_201_list_format_override_offset = LittleEndian.getInt(mainDocument, 0x2ea);
-        field_202_list_format_override_size= LittleEndian.getInt(mainDocument, 0x2ee);*/
-
-    }
-/*
-    public boolean useTable1()
-    {
-        return tabletype.setShort(field_6_options) > 0;
-    }
-    public int getFirstCharOffset()
-    {
-        return field_13_offset_first_char;
-    }
-    public int getStshOffset()
-    {
-        return field_56_stylesheet_offset;
-    }
-    public int getStshSize()
-    {
-        return field_57_stylesheet_size;
-    }
-    public int getSectionDescriptorOffset()
-    {
-        return field_66_section_plc_offset;
-    }
-    public int getSectionDescriptorSize()
-    {
-        return field_67_section_plc_size;
-    }
-    public int getChpBinTableOffset()
-    {
-        return field_78_chp_bin_table_offset;
-    }
-    public int getChpBinTableSize()
-    {
-        return field_79_chp_bin_table_size;
-    }
-    public int getPapBinTableOffset()
-    {
-        return field_80_pap_bin_table_offset;
-    }
-    public int getPapBinTableSize()
-    {
-        return field_81_pap_bin_table_size;
-    }
-    public int getFontsOffset()
-    {
-        return field_84_fonts_offset;
-    }
-    public int getFontsSize()
-    {
-        return field_85_fonts_size;
-    }
-    public int getDOPOffset()
-    {
-         return field_114_DOP_offset;
-    }
-    public int getDOPSize()
-    {
-        return field_115_DOP_size;
-    }
-    public int getComplexOffset()
-    {
-        return field_118_textPieceTable_offset;
-    }
-    public int getLSTOffset()
-    {
-        return field_199_list_format_offset;
-    }
-    public int getLSTSize()
-    {
-        return field_200_list_format_size;
-    }
-    public int getLFOOffset()
-    {
-        return field_201_list_format_override_offset;
-    }
-    public int getLFOSize()
-    {
-        return field_202_list_format_override_size;
-    }
-*/
-
-}
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
deleted file mode 100644
index 1d115b4df0..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class FontTable implements HDFType
-{
-  String[] fontNames;
-
-  public FontTable(byte[] fontTable)
-  {
-    int size = LittleEndian.getShort(fontTable, 0);
-    fontNames = new String[size];
-
-    int currentIndex = 4;
-    for(int x = 0; x < size; x++)
-    {
-      byte ffnLength = fontTable[currentIndex];
-
-      int nameOffset = currentIndex + 40;
-      StringBuffer nameBuf = new StringBuffer();
-      //char ch = Utils.getUnicodeCharacter(fontTable, nameOffset);
-      char ch = (char)LittleEndian.getShort(fontTable, nameOffset);
-      while(ch != '\0')
-      {
-        nameBuf.append(ch);
-        nameOffset += 2;
-        ch = (char)LittleEndian.getShort(fontTable, nameOffset);
-      }
-      fontNames[x] = nameBuf.toString();
-      currentIndex += ffnLength + 1;
-    }
-
-  }
-  public String getFont(int index)
-  {
-    return fontNames[index];
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
deleted file mode 100644
index 9e87269090..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents an FKP data structure. This data structure is used to store the
- * grpprls of the paragraph and character properties of the document. A grpprl
- * is a list of sprms(decompression operations) to perform on a parent style.
- *
- * The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets in the main stream for that
- * Paragraph's or Character run's text. The ending offset is the next
- * value in the array. For example, if an fkp has X number of Paragraph's
- * stored in it then there are (x + 1) 4 byte ints in the beginning array. The
- * number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public abstract class FormattedDiskPage
-{
-    protected byte[] _fkp;
-    protected int _crun;
-
-    /**
-     * Uses a 512-byte array to create a FKP
-     */
-    public FormattedDiskPage(byte[] fkp)
-    {
-        _crun = LittleEndian.getUnsignedByte(fkp, 511);
-        _fkp = fkp;
-    }
-    /**
-     * Used to get a text offset corresponding to a grpprl in this fkp.
-     * @param index The index of the property in this FKP
-     * @return an int representing an offset in the "WordDocument" stream
-     */
-    public int getStart(int index)
-    {
-        return LittleEndian.getInt(_fkp, (index * 4));
-    }
-    /**
-     * Used to get the end of the text corresponding to a grpprl in this fkp.
-     * @param index The index of the property in this fkp.
-     * @return an int representing an offset in the "WordDocument" stream
-     */
-    public int getEnd(int index)
-    {
-        return LittleEndian.getInt(_fkp, ((index + 1) * 4));
-    }
-    /**
-     * Used to get the total number of grrprl's stored int this FKP
-     * @return The number of grpprls in this FKP
-     */
-    public int size()
-    {
-        return _crun;
-    }
-
-    public abstract byte[] getGrpprl(int index);
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
deleted file mode 100644
index 7e2c87454b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- *
- * @author  andy
- */
-@Deprecated
-public interface HDFType {
-
-}
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
deleted file mode 100644
index 650d8c2edf..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class HeaderFooter
-{
-  public static final int HEADER_EVEN = 1;
-  public static final int HEADER_ODD = 2;
-  public static final int FOOTER_EVEN = 3;
-  public static final int FOOTER_ODD = 4;
-  public static final int HEADER_FIRST = 5;
-  public static final int FOOTER_FIRST = 6;
-
-  private int _type;
-  private int _start;
-  private int _end;
-
-  public HeaderFooter(int type, int startFC, int endFC)
-  {
-    _type = type;
-    _start = startFC;
-    _end = endFC;
-  }
-  public int getStart()
-  {
-    return _start;
-  }
-  public int getEnd()
-  {
-    return _end;
-  }
-  public boolean isEmpty()
-  {
-    return _start - _end == 0;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
deleted file mode 100644
index e5357d5543..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LFO
-{
-  int _lsid;
-  int _clfolvl;
-  LFOLVL[] _levels;
-
-  public LFO()
-  {
-
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
deleted file mode 100644
index dda687a3e0..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LFOLVL
-{
-  int _iStartAt;
-  int _ilvl;
-  boolean _fStartAt;
-  boolean _fFormatting;
-  LVL _override;
-
-  public LFOLVL()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
deleted file mode 100644
index 4b0bbe2383..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LST
-{
-  int _lsid;
-  int _tplc;
-  byte[] _rgistd = new byte[18];
-  boolean _fSimpleList;
-  LVL[] _levels;
-
-  public LST()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
deleted file mode 100644
index 4fe8e173d9..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class LVL
-{
-  public int _iStartAt;
-  public byte _nfc;
-  byte _jc;
-  boolean _fLegal;
-  boolean _fNoRestart;
-  boolean _fPrev;
-  boolean _fPrevSpace;
-  boolean _fWord6;
-  public byte[] _rgbxchNums = new byte[9];
-  public byte _ixchFollow;
-  public int _dxaSpace;
-  public int _dxaIndent;
-  public byte[] _chpx;
-  public byte[] _papx;
-  public char[] _xst;
-  public short _istd;
-
-  //byte _cbGrpprlChpx;
-  //byte _cbGrpprlPapx;
-
-
-  public LVL()
-  {
-  }
-  public Object clone()
-  {
-    LVL obj = null;
-    try
-    {
-      obj = (LVL)super.clone();
-    }
-    catch(Exception e)
-    {
-      e.printStackTrace();
-    }
-    return obj;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
deleted file mode 100644
index 279285b430..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import java.util.*;
-
-import org.apache.poi.hdf.extractor.*;
-
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class ListTables implements HDFType
-{
-
-  LFO[] _pllfo;
-  Hashtable _lists = new Hashtable();
-
-  public ListTables(byte[] plcflst, byte[] plflfo)
-  {
-    initLST(plcflst);
-    initLFO(plflfo);
-  }
-  public LVL getLevel(int list, int level)
-  {
-
-    LFO override = _pllfo[list - 1];
-
-    for(int x = 0; x < override._clfolvl; x++)
-    {
-      if(override._levels[x]._ilvl == level)
-      {
-        LFOLVL lfolvl = override._levels[x];
-        if(lfolvl._fFormatting)
-        {
-          LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-          LVL lvl = lfolvl._override;
-          lvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-          return lvl;
-        }
-        else if(lfolvl._fStartAt)
-        {
-          LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-          LVL lvl = lst._levels[level];
-          LVL newLvl = (LVL)lvl.clone();
-          newLvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-          newLvl._iStartAt = lfolvl._iStartAt;
-          return newLvl;
-        }
-      }
-    }
-
-    LST lst = (LST)_lists.get(Integer.valueOf(override._lsid));
-    LVL lvl = lst._levels[level];
-    lvl._istd = Utils.convertBytesToShort(lst._rgistd, level * 2);
-    return lvl;
-
-
-  }
-  private void initLST(byte[] plcflst)
-  {
-    short length = Utils.convertBytesToShort(plcflst, 0);
-    int nextLevelOffset = 0;
-    //LST[] lstArray = new LST[length];
-    for(int x = 0; x < length; x++)
-    {
-      LST lst = new LST();
-      lst._lsid = Utils.convertBytesToInt(plcflst, 2 + (x * 28));
-      lst._tplc = Utils.convertBytesToInt(plcflst, 2 + 4 + (x * 28));
-      System.arraycopy(plcflst, 2 + 8 + (x * 28), lst._rgistd, 0, 18);
-      byte code = plcflst[2 + 26 + (x * 28)];
-      lst._fSimpleList = StyleSheet.getFlag(code & 0x01);
-      //lstArray[x] = lst;
-      _lists.put(Integer.valueOf(lst._lsid), lst);
-
-      if(lst._fSimpleList)
-      {
-        lst._levels = new LVL[1];
-      }
-      else
-      {
-        lst._levels = new LVL[9];
-      }
-
-      for(int y = 0; y < lst._levels.length; y++)
-      {
-        int offset = 2 + (length * 28) + nextLevelOffset;
-        lst._levels[y] = new LVL();
-        nextLevelOffset += createLVL(plcflst, offset, lst._levels[y]);
-      }
-    }
-
-
-  }
-  private void initLFO(byte[] plflfo)
-  {
-    int lfoSize = Utils.convertBytesToInt(plflfo, 0);
-    _pllfo = new LFO[lfoSize];
-    for(int x = 0; x < lfoSize; x++)
-    {
-      LFO nextLFO = new LFO();
-      nextLFO._lsid = Utils.convertBytesToInt(plflfo, 4 + (x * 16));
-      nextLFO._clfolvl = plflfo[4 + 12 + (x * 16)];
-      nextLFO._levels = new LFOLVL[nextLFO._clfolvl];
-      _pllfo[x] = nextLFO;
-    }
-
-    int lfolvlOffset = (lfoSize * 16) + 4;
-    int lvlOffset = 0;
-    int lfolvlNum = 0;
-    for(int x = 0; x < lfoSize; x++)
-    {
-      if (_pllfo[x]._clfolvl == 0)
-        //  If LFO._clfolvl is 0, then it appears that Word writes
-        //  out a LFOLVL anyway - however, it's all 0xff.  We need
-        //  to skip over it.
-        lfolvlNum++;
-      else
-      {
-          for(int y = 0; y < _pllfo[x]._clfolvl; y++)
-          {
-            int offset = lfolvlOffset + (lfolvlNum * 8) + lvlOffset;
-            LFOLVL lfolvl = new LFOLVL();
-            lfolvl._iStartAt = Utils.convertBytesToInt(plflfo, offset);
-            lfolvl._ilvl = Utils.convertBytesToInt(plflfo, offset + 4);
-            lfolvl._fStartAt = StyleSheet.getFlag(lfolvl._ilvl & 0x10);
-            lfolvl._fFormatting = StyleSheet.getFlag(lfolvl._ilvl & 0x20);
-            lfolvl._ilvl = (lfolvl._ilvl & (byte)0x0f);
-            lfolvlNum++;
-
-            if(lfolvl._fFormatting)
-            {
-              // The size of a LFOLVL is 8 bytes.
-              offset = lfolvlOffset + (lfolvlNum * 8) + lvlOffset;
-              lfolvl._override = new LVL();
-              lvlOffset += createLVL(plflfo, offset, lfolvl._override);
-            }
-            _pllfo[x]._levels[y] = lfolvl;
-          }
-      }
-    }
-  }
-  private int createLVL(byte[] data, int offset, LVL lvl)
-  {
-    int startingOffset = offset;
-    lvl._iStartAt = Utils.convertBytesToInt(data, offset);
-    offset += 4;
-    lvl._nfc = data[offset++];
-    byte code = data[offset++];
-    lvl._jc = (byte)(code & 0x03);
-    lvl._fLegal = StyleSheet.getFlag(code & 0x04);
-    lvl._fNoRestart = StyleSheet.getFlag(code & 0x08);
-    lvl._fPrev = StyleSheet.getFlag(code & 0x10);
-    lvl._fPrevSpace = StyleSheet.getFlag(code & 0x20);
-    lvl._fWord6 = StyleSheet.getFlag(code & 0x40);
-
-    //  rgbxchNums - This array should be zero terminated unless it is full
-    //  (all 9 levels full).
-    System.arraycopy(data, offset, lvl._rgbxchNums, 0, 9);
-    offset += 9;
-
-    lvl._ixchFollow = data[offset++];
-
-    if (lvl._fWord6)
-    {
-      lvl._dxaSpace = Utils.convertBytesToInt(data, offset);
-      lvl._dxaIndent = Utils.convertBytesToInt(data, offset + 4);
-    }
-    offset += 8;
-
-    int chpxSize = data[offset++];
-    int papxSize = data[offset++];
-    lvl._chpx = new byte[chpxSize];
-    lvl._papx = new byte[papxSize];
-
-    System.arraycopy(data, offset, lvl._chpx, 0, chpxSize);
-    System.arraycopy(data, offset + chpxSize, lvl._papx, 0, papxSize);
-
-    offset += papxSize + chpxSize + 2;  //don't forget to skip reserved word
-    int xstSize = Utils.convertBytesToShort(data, offset);
-    offset += 2;
-    lvl._xst = new char[xstSize];
-
-    for(int x = 0; x < xstSize; x++)
-    {
-      lvl._xst[x] = (char)Utils.convertBytesToShort(data, offset + (x * 2));
-    }
-    return offset + (xstSize * 2) - startingOffset;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
deleted file mode 100644
index 70e7e229aa..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a PAP FKP. The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets in the main stream for that
- * Paragraph's or Character run's text. The ending offset is the next
- * value in the array. For example, if an fkp has X number of Paragraph's
- * stored in it then there are (x + 1) 4 byte ints in the beginning array. The
- * number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PAPFormattedDiskPage extends FormattedDiskPage
-{
-
-    /**
-     * Creates a PAPFormattedDiskPage from a 512 byte array
-     *
-     * @param fkp a 512 byte array.
-     */
-    public PAPFormattedDiskPage(byte[] fkp)
-    {
-        super(fkp);
-    }
-
-    /**
-     * Gets the papx for the pagraph at index in this fkp.
-     *
-     * @param index The index of the papx to get.
-     * @return a papx grpprl.
-     */
-    public byte[] getGrpprl(int index)
-    {
-        int papxOffset = 2 * LittleEndian.getUnsignedByte(_fkp, ((_crun + 1) * 4) + (index * 13));
-        int size = 2 * LittleEndian.getUnsignedByte(_fkp, papxOffset);
-        if(size == 0)
-        {
-            size = 2 * LittleEndian.getUnsignedByte(_fkp, ++papxOffset);
-        }
-        else
-        {
-            size--;
-        }
-
-        byte[] papx = new byte[size];
-        System.arraycopy(_fkp, ++papxOffset, papx, 0, size);
-        return papx;
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
deleted file mode 100644
index 12e282973d..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PapxNode extends PropertyNode
-{
-
-
-  public PapxNode(int fcStart, int fcEnd, byte[] papx)
-  {
-    super(fcStart, fcEnd, papx);
-  }
-  public byte[] getPapx()
-  {
-    return super.getGrpprl();
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
deleted file mode 100644
index 686e75d42d..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.hdf.model.hdftypes.definitions.PAPAbstractType;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class ParagraphProperties  extends PAPAbstractType implements Cloneable
-{
-
-
-  public ParagraphProperties()
-  {
-    short[] lspd = new short[2];
-    setFWidowControl((byte)1);
-    //lspd[0] = 240;
-    lspd[1] = 1;
-    setIlvl((byte)9);
-
-    setLspd(lspd);
-    setBrcBar(new short[2]);
-    setBrcBottom(new short[2]);
-    setBrcLeft(new short[2]);
-    setBrcBetween(new short[2]);
-    setBrcRight(new short[2]);
-    setBrcTop(new short[2]);
-    setPhe(new byte[12]);
-    setAnld(new byte[84]);
-    setDttmPropRMark(new byte[4]);
-    setNumrm(new byte[8]);
-
-
-  }
-  public Object clone() throws CloneNotSupportedException
-  {
-      ParagraphProperties clone =  (ParagraphProperties)super.clone();
-
-      short[] brcBar = new short[2];
-      short[] brcBottom = new short[2];
-      short[] brcLeft = new short[2];
-      short[] brcBetween = new short[2];
-      short[] brcRight = new short[2];
-      short[] brcTop = new short[2];
-      short[] lspd = new short[2];
-      byte[] phe = new byte[12];
-      byte[] anld = new byte[84];
-      byte[] dttmPropRMark = new byte[4];
-      byte[] numrm = new byte[8];
-
-      System.arraycopy(getBrcBar(), 0, brcBar, 0, 2);
-      System.arraycopy(getBrcBottom(), 0, brcBottom, 0, 2);
-      System.arraycopy(getBrcLeft(), 0, brcLeft, 0, 2);
-      System.arraycopy(getBrcBetween(), 0, brcBetween, 0, 2);
-      System.arraycopy(getBrcRight(), 0, brcRight, 0, 2);
-      System.arraycopy(getBrcTop(), 0, brcTop, 0, 2);
-      System.arraycopy(getLspd(), 0, lspd, 0, 2);
-      System.arraycopy(getPhe(), 0, phe, 0, 12);
-      System.arraycopy(getAnld(), 0, anld, 0, 84);
-      System.arraycopy(getDttmPropRMark(), 0, dttmPropRMark, 0, 4);
-      System.arraycopy(getNumrm(), 0, numrm, 0, 8);
-
-
-      clone.setBrcBar(brcBar);
-      clone.setBrcBottom(brcBottom);
-      clone.setBrcLeft(brcLeft);
-      clone.setBrcBetween(brcBetween);
-      clone.setBrcRight(brcRight);
-      clone.setBrcTop(brcTop);
-      clone.setLspd(lspd);
-      clone.setPhe(phe);
-      clone.setAnld(anld);
-      clone.setDttmPropRMark(dttmPropRMark);
-      clone.setNumrm(numrm);
-      return clone;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
deleted file mode 100644
index 98a9e69a3c..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-
-/**
- * common data structure in a Word file. Contains an array of 4 byte ints in
- * the front that relate to an array of abitrary data structures in the back.
- *
- * This class acts more like a pointer. In the sense that it doesn't store any
- * data. It only provides convenience methods for accessing a particular
- * PlexOfCps
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class PlexOfCps
-{
-    private int _count;
-    private int _offset;
-    private int _sizeOfStruct;
-
-
-    /**
-     * Constructor
-     *
-     * @param size The size in bytes of this PlexOfCps
-     * @param sizeOfStruct The size of the data structure type stored in
-     *        this PlexOfCps.
-     */
-    public PlexOfCps(int size, int sizeOfStruct)
-    {
-        _count = (size - 4)/(4 + sizeOfStruct);
-        _sizeOfStruct = sizeOfStruct;
-    }
-    public int getIntOffset(int index)
-    {
-      return index * 4;
-    }
-    /**
-     * returns the number of data structures in this PlexOfCps.
-     *
-     * @return The number of data structures in this PlexOfCps
-     */
-    public int length()
-    {
-        return _count;
-    }
-    /**
-     * Returns the offset, in bytes, from the beginning if this PlexOfCps to
-     * the data structure at index.
-     *
-     * @param index The index of the data structure.
-     *
-     * @return The offset, in bytes, from the beginning if this PlexOfCps to
-     *         the data structure at index.
-     */
-    public int getStructOffset(int index)
-    {
-        return (4 * (_count + 1)) + (_sizeOfStruct * index);
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
deleted file mode 100644
index 82b5aeead8..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-
-/**
- * Represents a lightweight node in the Trees used to store formatting
- * properties.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public abstract class PropertyNode implements Comparable {
-  private byte[] _grpprl;
-  private int _fcStart;
-  private int _fcEnd;
-
-  /**
-   * @param fcStart The start of the text for this property.
-   * @param fcEnd The end of the text for this property.
-   * @param grpprl The property description in compressed form.
-   */
-  public PropertyNode(int fcStart, int fcEnd, byte[] grpprl)
-  {
-      _fcStart = fcStart;
-      _fcEnd = fcEnd;
-      _grpprl = grpprl;
-  }
-  /**
-   * @return The offset of this property's text.
-   */
-  public int getStart()
-  {
-      return _fcStart;
-  }
-  /**
-   * @return The offset of the end of this property's text.
-   */
-  public int getEnd()
-  {
-    return _fcEnd;
-  }
-  /**
-   * @return This property's property in copmpressed form.
-   */
-  protected byte[] getGrpprl()
-  {
-    return _grpprl;
-  }
-  /**
-   * Used for sorting in collections.
-   */
-  public int compareTo(Object o)
-  {
-      int fcEnd = ((PropertyNode)o).getEnd();
-      if(_fcEnd == fcEnd)
-      {
-        return 0;
-      }
-      else if(_fcEnd < fcEnd)
-      {
-        return -1;
-      }
-      else
-      {
-        return 1;
-      }
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
deleted file mode 100644
index 463c9056d8..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.hdf.model.hdftypes.definitions.SEPAbstractType;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class SectionProperties extends SEPAbstractType implements HDFType
-{
-  /*int _index;
-  byte _bkc;
-  boolean _fTitlePage;
-  boolean _fAutoPgn;
-  byte _nfcPgn;
-  boolean _fUnlocked;
-  byte _cnsPgn;
-  boolean _fPgnRestart;
-  boolean _fEndNote;
-  byte _lnc;
-  byte _grpfIhdt;
-  short _nLnnMod;
-  int _dxaLnn;
-  short _dxaPgn;
-  short _dyaPgn;
-  boolean _fLBetween;
-  byte _vjc;
-  short _dmBinFirst;
-  short _dmBinOther;
-  short _dmPaperReq;
-  short[] _brcTop = new short[2];
-  short[] _brcLeft = new short[2];
-  short[] _brcBottom = new short[2];
-  short[] _brcRight = new short[2];
-  boolean _fPropMark;
-  int _dxtCharSpace;
-  int _dyaLinePitch;
-  short _clm;
-  byte _dmOrientPage;
-  byte _iHeadingPgn;
-  short _pgnStart;
-  short _lnnMin;
-  short _wTextFlow;
-  short _pgbProp;
-  int _xaPage;
-  int _yaPage;
-  int _dxaLeft;
-  int _dxaRight;
-  int _dyaTop;
-  int _dyaBottom;
-  int _dzaGutter;
-  int _dyaHdrTop;
-  int _dyaHdrBottom;
-  short _ccolM1;
-  boolean _fEvenlySpaced;
-  int _dxaColumns;
-  int[] _rgdxaColumnWidthSpacing;
-  byte _dmOrientFirst;
-  byte[] _olstAnn;*/
-
-
-
-  public SectionProperties()
-  {
-      setBkc((byte)2);
-      setDyaPgn(720);
-      setDxaPgn(720);
-      setFEndNote(true);
-      setFEvenlySpaced(true);
-      setXaPage(12240);
-      setYaPage(15840);
-      setDyaHdrTop(720);
-      setDyaHdrBottom(720);
-      setDmOrientPage((byte)1);
-      setDxaColumns(720);
-      setDyaTop(1440);
-      setDxaLeft(1800);
-      setDyaBottom(1440);
-      setDxaRight(1800);
-      setPgnStart(1);
-
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
deleted file mode 100644
index dd4fc68065..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class SepxNode extends PropertyNode
-{
-
-  int _index;
-
-  public SepxNode(int index, int start, int end, byte[] sepx)
-  {
-    super(start, end, sepx);
-  }
-  public byte[] getSepx()
-  {
-    return getGrpprl();
-  }
-
-  public int compareTo(Object obj) {
-      return 0;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
deleted file mode 100644
index 9e3d6c2398..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class StyleDescription implements HDFType
-{
-
-  private static int PARAGRAPH_STYLE = 1;
-  private static int CHARACTER_STYLE = 2;
-
-  int _baseStyleIndex;
-  int _styleTypeCode;
-  int _numUPX;
-  byte[] _papx;
-  byte[] _chpx;
-  ParagraphProperties _pap;
-  CharacterProperties _chp;
-
-  public StyleDescription()
-  {
-      _pap = new ParagraphProperties();
-      _chp = new CharacterProperties();
-  }
-  public StyleDescription(byte[] std, int baseLength, boolean word9)
-  {
-      int infoShort = LittleEndian.getShort(std, 2);
-      _styleTypeCode = (infoShort & 0xf);
-      _baseStyleIndex = (infoShort & 0xfff0) >> 4;
-
-      infoShort = LittleEndian.getShort(std, 4);
-      _numUPX = infoShort & 0xf;
-
-      //first byte(s) of variable length section of std is the length of the
-      //style name and aliases string
-      int nameLength = 0;
-      int multiplier = 1;
-      if(word9)
-      {
-          nameLength = LittleEndian.getShort(std, baseLength);
-          multiplier = 2;
-      }
-      else
-      {
-          nameLength = std[baseLength];
-      }
-      //2 bytes for length, length then null terminator.
-      int grupxStart = multiplier + ((nameLength + 1) * multiplier) + baseLength;
-
-      int offset = 0;
-      for(int x = 0; x < _numUPX; x++)
-      {
-          int upxSize = LittleEndian.getShort(std, grupxStart + offset);
-          if(_styleTypeCode == PARAGRAPH_STYLE)
-          {
-              if(x == 0)
-              {
-                  _papx = new byte[upxSize];
-                  System.arraycopy(std, grupxStart + offset + 2, _papx, 0, upxSize);
-              }
-              else if(x == 1)
-              {
-                  _chpx = new byte[upxSize];
-                  System.arraycopy(std, grupxStart + offset + 2, _chpx, 0, upxSize);
-              }
-          }
-          else if(_styleTypeCode == CHARACTER_STYLE && x == 0)
-          {
-              _chpx = new byte[upxSize];
-              System.arraycopy(std, grupxStart + offset + 2, _chpx, 0, upxSize);
-          }
-
-          if(upxSize % 2 == 1)
-          {
-              ++upxSize;
-          }
-          offset += 2 + upxSize;
-      }
-
-
-
-  }
-  public int getBaseStyle()
-  {
-      return _baseStyleIndex;
-  }
-  public byte[] getCHPX()
-  {
-      return _chpx;
-  }
-  public byte[] getPAPX()
-  {
-      return _papx;
-  }
-  public ParagraphProperties getPAP()
-  {
-      return _pap;
-  }
-  public CharacterProperties getCHP()
-  {
-      return _chp;
-  }
-  public void setPAP(ParagraphProperties pap)
-  {
-      _pap = pap;
-  }
-  public void setCHP(CharacterProperties chp)
-  {
-      _chp = chp;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
deleted file mode 100644
index c4a935d252..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
+++ /dev/null
@@ -1,1471 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hdf.model.hdftypes.definitions.TCAbstractType;
-
-/**
- * Represents a document's stylesheet. A word documents formatting is stored as
- * compressed styles that are based on styles contained in the stylesheet. This
- * class also contains static utility functions to uncompress different
- * formatting properties.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class StyleSheet implements HDFType {
-
-  private static final int NIL_STYLE = 4095;
-  private static final int PAP_TYPE = 1;
-  private static final int CHP_TYPE = 2;
-  private static final int SEP_TYPE = 4;
-  private static final int TAP_TYPE = 5;
-  //Vector _styleDescriptions;
-  StyleDescription _nilStyle = new StyleDescription();
-  StyleDescription[] _styleDescriptions;
-
-  /**
-   * StyleSheet constructor. Loads a document's stylesheet information,
-   *
-   * @param styleSheet A byte array containing a document's raw stylesheet
-   *        info. Found by using FileInformationBlock.getFcStshf() and
-   *        FileInformationBLock.getLcbStshf()
-   */
-  public StyleSheet(byte[] styleSheet)
-  {
-      int stshiLength = LittleEndian.getShort(styleSheet, 0);
-      int stdCount = LittleEndian.getShort(styleSheet, 2);
-      int baseLength = LittleEndian.getShort(styleSheet, 4);
-      int[] rgftc = new int[3];
-
-      rgftc[0] = LittleEndian.getInt(styleSheet, 14);
-      rgftc[1] = LittleEndian.getInt(styleSheet, 18);
-      rgftc[2] = LittleEndian.getInt(styleSheet, 22);
-
-      int offset = 0;
-      _styleDescriptions = new StyleDescription[stdCount];
-      for(int x = 0; x < stdCount; x++)
-      {
-          int stdOffset = (2 + stshiLength) + offset;
-          int stdSize = LittleEndian.getShort(styleSheet, stdOffset);
-          if(stdSize > 0)
-          {
-              byte[] std = new byte[stdSize];
-
-              //get past the size
-              stdOffset += 2;
-              System.arraycopy(styleSheet, stdOffset, std, 0, stdSize);
-              StyleDescription aStyle = new StyleDescription(std, baseLength, true);
-
-              _styleDescriptions[x] = aStyle;
-          }
-
-
-          offset += stdSize + 2;
-
-      }
-      for(int x = 0; x < _styleDescriptions.length; x++)
-      {
-          if(_styleDescriptions[x] != null)
-          {
-              createPap(x);
-              createChp(x);
-          }
-      }
-  }
-  /**
-   * Creates a PartagraphProperties object from a papx stored in the
-   * StyleDescription at the index istd in the StyleDescription array. The PAP
-   * is placed in the StyleDescription at istd after its been created. Not
-   * every StyleDescription will contain a papx. In these cases this function
-   * does nothing
-   *
-   * @param istd The index of the StyleDescription to create the
-   *        ParagraphProperties  from (and also place the finished PAP in)
-   */
-  private void createPap(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      ParagraphProperties pap = sd.getPAP();
-      byte[] papx = sd.getPAPX();
-      int baseIndex = sd.getBaseStyle();
-      if(pap == null && papx != null)
-      {
-          ParagraphProperties parentPAP = _nilStyle.getPAP();
-          if(baseIndex != NIL_STYLE)
-          {
-
-              parentPAP = _styleDescriptions[baseIndex].getPAP();
-              if(parentPAP == null)
-              {
-                  createPap(baseIndex);
-                  parentPAP = _styleDescriptions[baseIndex].getPAP();
-              }
-
-          }
-
-          pap = (ParagraphProperties)uncompressProperty(papx, parentPAP, this);
-          sd.setPAP(pap);
-      }
-  }
-  /**
-   * Creates a CharacterProperties object from a chpx stored in the
-   * StyleDescription at the index istd in the StyleDescription array. The
-   * CharacterProperties object is placed in the StyleDescription at istd after
-   * its been created. Not every StyleDescription will contain a chpx. In these
-   * cases this function does nothing.
-   *
-   * @param istd The index of the StyleDescription to create the
-   *        CharacterProperties object from.
-   */
-  private void createChp(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      CharacterProperties chp = sd.getCHP();
-      byte[] chpx = sd.getCHPX();
-      int baseIndex = sd.getBaseStyle();
-      if(chp == null && chpx != null)
-      {
-          CharacterProperties parentCHP = _nilStyle.getCHP();
-          if(baseIndex != NIL_STYLE)
-          {
-
-              parentCHP = _styleDescriptions[baseIndex].getCHP();
-              if(parentCHP == null)
-              {
-                  createChp(baseIndex);
-                  parentCHP = _styleDescriptions[baseIndex].getCHP();
-              }
-
-          }
-
-          chp = (CharacterProperties)uncompressProperty(chpx, parentCHP, this);
-          sd.setCHP(chp);
-      }
-  }
-
-  /**
-   * Gets the StyleDescription at index x.
-   *
-   * @param x the index of the desired StyleDescription.
-   */
-  public StyleDescription getStyleDescription(int x)
-  {
-      return _styleDescriptions[x];
-  }
-
-  /**
-   * Used in decompression of a chpx. This performs an operation defined by
-   * a single sprm.
-   *
-   * @param oldCHP The base CharacterProperties.
-   * @param newCHP The current CharacterProperties.
-   * @param operand The operand defined by the sprm (See Word file format spec)
-   * @param param The parameter defined by the sprm (See Word file format spec)
-   * @param varParam The variable length parameter defined by the sprm. (See
-   *        Word file format spec)
-   * @param grpprl The entire chpx that this operation is a part of.
-   * @param offset The offset in the grpprl of the next sprm
-   * @param styleSheet The StyleSheet for this document.
-   */
-  static void doCHPOperation(CharacterProperties oldCHP, CharacterProperties newCHP,
-                             int operand, int param,
-                             byte[] varParam, byte[] grpprl, int offset,
-                             StyleSheet styleSheet)
-  {
-      switch(operand)
-      {
-          case 0:
-               newCHP.setFRMarkDel(getFlag(param));
-               break;
-          case 0x1:
-               newCHP.setFRMark(getFlag(param));
-               break;
-          case 0x2:
-               break;
-          case 0x3:
-               newCHP.setFcPic(param);
-               newCHP.setFSpec(true);
-               break;
-          case 0x4:
-               newCHP.setIbstRMark((short)param);
-               break;
-          case 0x5:
-               short[] dttmRMark = new short[2];
-               dttmRMark[0] = LittleEndian.getShort(grpprl, (offset - 4));
-               dttmRMark[1] = LittleEndian.getShort(grpprl, (offset - 2));
-               newCHP.setDttmRMark(dttmRMark);
-               break;
-          case 0x6:
-               newCHP.setFData(getFlag(param));
-               break;
-          case 0x7:
-               //don't care about this
-               break;
-          case 0x8:
-               short chsDiff = (short)((param & 0xff0000) >>> 8);
-               newCHP.setFChsDiff(getFlag(chsDiff));
-               newCHP.setChse((short)(param & 0xffff));
-               break;
-          case 0x9:
-               newCHP.setFSpec(true);
-               newCHP.setFtcSym(LittleEndian.getShort(varParam, 0));
-               newCHP.setXchSym(LittleEndian.getShort(varParam, 2));
-               break;
-          case 0xa:
-               newCHP.setFOle2(getFlag(param));
-               break;
-          case 0xb:
-               //?
-               break;
-          case 0xc:
-               newCHP.setIcoHighlight((byte)param);
-               newCHP.setFHighlight(getFlag(param));
-               break;
-          case 0xd:
-               break;
-          case 0xe:
-               newCHP.setFcObj(param);
-               break;
-          case 0xf:
-               break;
-          case 0x10:
-               //?
-               break;
-          case 0x11:
-               break;
-          case 0x12:
-               break;
-          case 0x13:
-               break;
-          case 0x14:
-               break;
-          case 0x15:
-               break;
-          case 0x16:
-               break;
-          case 0x17:
-               break;
-          case 0x18:
-               break;
-          case 0x19:
-               break;
-          case 0x1a:
-               break;
-          case 0x1b:
-               break;
-          case 0x1c:
-               break;
-          case 0x1d:
-               break;
-          case 0x1e:
-               break;
-          case 0x1f:
-               break;
-          case 0x20:
-               break;
-          case 0x21:
-               break;
-          case 0x22:
-               break;
-          case 0x23:
-               break;
-          case 0x24:
-               break;
-          case 0x25:
-               break;
-          case 0x26:
-               break;
-          case 0x27:
-               break;
-          case 0x28:
-               break;
-          case 0x29:
-               break;
-          case 0x2a:
-               break;
-          case 0x2b:
-               break;
-          case 0x2c:
-               break;
-          case 0x2d:
-               break;
-          case 0x2e:
-               break;
-          case 0x2f:
-               break;
-          case 0x30:
-               newCHP.setIstd(param);
-               break;
-          case 0x31:
-               //permutation vector for fast saves, who cares!
-               break;
-          case 0x32:
-               newCHP.setFBold(false);
-               newCHP.setFItalic(false);
-               newCHP.setFOutline(false);
-               newCHP.setFStrike(false);
-               newCHP.setFShadow(false);
-               newCHP.setFSmallCaps(false);
-               newCHP.setFCaps(false);
-               newCHP.setFVanish(false);
-               newCHP.setKul((byte)0);
-               newCHP.setIco((byte)0);
-               break;
-          case 0x33:
-               // ... this code has no effect ...
-               //  try {
-               //      newCHP = (CharacterProperties)oldCHP.clone();
-               //  }
-               //  catch(CloneNotSupportedException e) {
-               //      //do nothing
-               //  }
-              break;
-          case 0x34:
-               break;
-          case 0x35:
-               newCHP.setFBold(getCHPFlag((byte)param, oldCHP.isFBold()));
-               break;
-          case 0x36:
-               newCHP.setFItalic(getCHPFlag((byte)param, oldCHP.isFItalic()));
-               break;
-          case 0x37:
-               newCHP.setFStrike(getCHPFlag((byte)param, oldCHP.isFStrike()));
-               break;
-          case 0x38:
-               newCHP.setFOutline(getCHPFlag((byte)param, oldCHP.isFOutline()));
-               break;
-          case 0x39:
-               newCHP.setFShadow(getCHPFlag((byte)param, oldCHP.isFShadow()));
-               break;
-          case 0x3a:
-               newCHP.setFSmallCaps(getCHPFlag((byte)param, oldCHP.isFSmallCaps()));
-               break;
-          case 0x3b:
-               newCHP.setFCaps(getCHPFlag((byte)param, oldCHP.isFCaps()));
-               break;
-          case 0x3c:
-               newCHP.setFVanish(getCHPFlag((byte)param, oldCHP.isFVanish()));
-               break;
-          case 0x3d:
-               newCHP.setFtcAscii((short)param);
-               break;
-          case 0x3e:
-               newCHP.setKul((byte)param);
-               break;
-          case 0x3f:
-               int hps = param & 0xff;
-               if(hps != 0)
-               {
-                  newCHP.setHps(hps);
-               }
-               byte cInc = (byte)(((byte)(param & 0xfe00) >>> 4) >> 1);
-               if(cInc != 0)
-               {
-                  newCHP.setHps(Math.max(newCHP.getHps() + (cInc * 2), 2));
-               }
-               byte hpsPos = (byte)((param & 0xff0000) >>> 8);
-               if(hpsPos != 0x80)
-               {
-                  newCHP.setHpsPos(hpsPos);
-               }
-               boolean fAdjust = (param & 0x0100) > 0;
-               if(fAdjust && hpsPos != 128 && hpsPos != 0 && oldCHP.getHpsPos() == 0)
-               {
-                  newCHP.setHps(Math.max(newCHP.getHps() + (-2), 2));
-               }
-               if(fAdjust && hpsPos == 0 && oldCHP.getHpsPos() != 0)
-               {
-                  newCHP.setHps(Math.max(newCHP.getHps() + 2, 2));
-               }
-               break;
-          case 0x40:
-               newCHP.setDxaSpace(param);
-               break;
-          case 0x41:
-               newCHP.setLidDefault((short)param);
-               break;
-          case 0x42:
-               newCHP.setIco((byte)param);
-               break;
-          case 0x43:
-               newCHP.setHps(param);
-               break;
-          case 0x44:
-               byte hpsLvl = (byte)param;
-               newCHP.setHps(Math.max(newCHP.getHps() + (hpsLvl * 2), 2));
-               break;
-          case 0x45:
-               newCHP.setHpsPos((short)param);
-               break;
-          case 0x46:
-               if(param != 0)
-               {
-                  if(oldCHP.getHpsPos() == 0)
-                  {
-                      newCHP.setHps(Math.max(newCHP.getHps() + (-2), 2));
-                  }
-               }
-               else
-               {
-                  if(oldCHP.getHpsPos() != 0)
-                  {
-                      newCHP.setHps(Math.max(newCHP.getHps() + 2, 2));
-                  }
-               }
-               break;
-          case 0x47:
-               CharacterProperties genCHP = new CharacterProperties();
-               genCHP.setFtcAscii(4);
-               genCHP = (CharacterProperties)uncompressProperty(varParam, genCHP, styleSheet);
-               CharacterProperties styleCHP = styleSheet.getStyleDescription(oldCHP.getBaseIstd()).getCHP();
-               if(genCHP.isFBold() == newCHP.isFBold())
-               {
-                  newCHP.setFBold(styleCHP.isFBold());
-               }
-               if(genCHP.isFItalic() == newCHP.isFItalic())
-               {
-                  newCHP.setFItalic(styleCHP.isFItalic());
-               }
-               if(genCHP.isFSmallCaps() == newCHP.isFSmallCaps())
-               {
-                  newCHP.setFSmallCaps(styleCHP.isFSmallCaps());
-               }
-               if(genCHP.isFVanish() == newCHP.isFVanish())
-               {
-                  newCHP.setFVanish(styleCHP.isFVanish());
-               }
-               if(genCHP.isFStrike() == newCHP.isFStrike())
-               {
-                  newCHP.setFStrike(styleCHP.isFStrike());
-               }
-               if(genCHP.isFCaps() == newCHP.isFCaps())
-               {
-                  newCHP.setFCaps(styleCHP.isFCaps());
-               }
-               if(genCHP.getFtcAscii() == newCHP.getFtcAscii())
-               {
-                  newCHP.setFtcAscii(styleCHP.getFtcAscii());
-               }
-               if(genCHP.getFtcFE() == newCHP.getFtcFE())
-               {
-                  newCHP.setFtcFE(styleCHP.getFtcFE());
-               }
-               if(genCHP.getFtcOther() == newCHP.getFtcOther())
-               {
-                  newCHP.setFtcOther(styleCHP.getFtcOther());
-               }
-               if(genCHP.getHps() == newCHP.getHps())
-               {
-                  newCHP.setHps(styleCHP.getHps());
-               }
-               if(genCHP.getHpsPos() == newCHP.getHpsPos())
-               {
-                  newCHP.setHpsPos(styleCHP.getHpsPos());
-               }
-               if(genCHP.getKul() == newCHP.getKul())
-               {
-                  newCHP.setKul(styleCHP.getKul());
-               }
-               if(genCHP.getDxaSpace() == newCHP.getDxaSpace())
-               {
-                  newCHP.setDxaSpace(styleCHP.getDxaSpace());
-               }
-               if(genCHP.getIco() == newCHP.getIco())
-               {
-                  newCHP.setIco(styleCHP.getIco());
-               }
-               if(genCHP.getLidDefault() == newCHP.getLidDefault())
-               {
-                  newCHP.setLidDefault(styleCHP.getLidDefault());
-               }
-               if(genCHP.getLidFE() == newCHP.getLidFE())
-               {
-                  newCHP.setLidFE(styleCHP.getLidFE());
-               }
-               break;
-          case 0x48:
-               newCHP.setIss((byte)param);
-               break;
-          case 0x49:
-               newCHP.setHps(LittleEndian.getShort(varParam, 0));
-               break;
-          case 0x4a:
-               int increment = LittleEndian.getShort(varParam, 0);
-               newCHP.setHps(Math.max(newCHP.getHps() + increment, 8));
-               break;
-          case 0x4b:
-               newCHP.setHpsKern(param);
-               break;
-          case 0x4c:
-               doCHPOperation(oldCHP, newCHP, 0x47, param, varParam, grpprl, offset, styleSheet);
-               break;
-          case 0x4d:
-               float percentage = param/100.0f;
-               int add = (int)(percentage * newCHP.getHps());
-               newCHP.setHps(newCHP.getHps() + add);
-               break;
-          case 0x4e:
-               newCHP.setYsr((byte)param);
-               break;
-          case 0x4f:
-               newCHP.setFtcAscii((short)param);
-               break;
-          case 0x50:
-               newCHP.setFtcFE((short)param);
-               break;
-          case 0x51:
-               newCHP.setFtcOther((short)param);
-               break;
-          case 0x52:
-               break;
-          case 0x53:
-               newCHP.setFDStrike(getFlag(param));
-               break;
-          case 0x54:
-               newCHP.setFImprint(getFlag(param));
-               break;
-          case 0x55:
-               newCHP.setFSpec(getFlag(param));
-               break;
-          case 0x56:
-               newCHP.setFObj(getFlag(param));
-               break;
-          case 0x57:
-               newCHP.setFPropMark(varParam[0]);
-               newCHP.setIbstPropRMark(LittleEndian.getShort(varParam, 1));
-               newCHP.setDttmPropRMark(LittleEndian.getInt(varParam, 3));
-               break;
-          case 0x58:
-               newCHP.setFEmboss(getFlag(param));
-               break;
-          case 0x59:
-               newCHP.setSfxtText((byte)param);
-               break;
-          case 0x5a:
-               break;
-          case 0x5b:
-               break;
-          case 0x5c:
-               break;
-          case 0x5d:
-               break;
-          case 0x5e:
-               break;
-          case 0x5f:
-               break;
-          case 0x60:
-               break;
-          case 0x61:
-               break;
-          case 0x62:
-               byte[] xstDispFldRMark = new byte[32];
-               newCHP.setFDispFldRMark(varParam[0]);
-               newCHP.setIbstDispFldRMark(LittleEndian.getShort(varParam, 1));
-               newCHP.setDttmDispFldRMark(LittleEndian.getInt(varParam, 3));
-               System.arraycopy(varParam, 7, xstDispFldRMark, 0, 32);
-               newCHP.setXstDispFldRMark(xstDispFldRMark);
-               break;
-          case 0x63:
-               newCHP.setIbstRMarkDel((short)param);
-               break;
-          case 0x64:
-               short[] dttmRMarkDel = new short[2];
-               dttmRMarkDel[0] = LittleEndian.getShort(grpprl, offset - 4);
-               dttmRMarkDel[1] = LittleEndian.getShort(grpprl, offset - 2);
-               newCHP.setDttmRMarkDel(dttmRMarkDel);
-               break;
-          case 0x65:
-               short[] brc = new short[2];
-               brc[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brc[1] = LittleEndian.getShort(grpprl, offset - 2);
-               newCHP.setBrc(brc);
-               break;
-          case 0x66:
-               newCHP.setShd((short)param);
-               break;
-          case 0x67:
-               break;
-          case 0x68:
-               break;
-          case 0x69:
-               break;
-          case 0x6a:
-               break;
-          case 0x6b:
-               break;
-          case 0x6c:
-               break;
-          case 0x6d:
-               newCHP.setLidDefault((short)param);
-               break;
-          case 0x6e:
-               newCHP.setLidFE((short)param);
-               break;
-          case 0x6f:
-               newCHP.setIdctHint((byte)param);
-               break;
-      }
-  }
-
-  /**
-   * Used to uncompress a property stored in a grpprl. These include
-   * CharacterProperties, ParagraphProperties, TableProperties, and
-   * SectionProperties.
-   *
-   * @param grpprl The compressed form of the property.
-   * @param parent The base property of the property.
-   * @param styleSheet The document's stylesheet.
-   *
-   * @return An object that should be casted to the appropriate property.
-   */
-  public static Object uncompressProperty(byte[] grpprl, Object parent, StyleSheet styleSheet)
-  {
-    return uncompressProperty(grpprl, parent, styleSheet, true);
-  }
-
-  /**
-   * Used to uncompress a property stored in a grpprl. These include
-   * CharacterProperties, ParagraphProperties, TableProperties, and
-   * SectionProperties.
-   *
-   * @param grpprl The compressed form of the property.
-   * @param parent The base property of the property.
-   * @param styleSheet The document's stylesheet.
-   *
-   * @return An object that should be casted to the appropriate property.
-   */
-  public static Object uncompressProperty(byte[] grpprl, Object parent, StyleSheet styleSheet, boolean doIstd)
-  {
-      Object newProperty = null;
-      int offset = 0;
-      int propertyType = PAP_TYPE;
-
-
-      if(parent instanceof ParagraphProperties)
-      {
-          try
-          {
-              newProperty = ((ParagraphProperties)parent).clone();
-          }
-          catch(Exception e){}
-          if(doIstd)
-          {
-            ((ParagraphProperties)newProperty).setIstd(LittleEndian.getShort(grpprl, 0));
-
-            offset = 2;
-          }
-      }
-      else if(parent instanceof CharacterProperties)
-      {
-          try
-          {
-              newProperty = ((CharacterProperties)parent).clone();
-              ((CharacterProperties)newProperty).setBaseIstd(((CharacterProperties)parent).getIstd());
-          }
-          catch(Exception e){}
-          propertyType = CHP_TYPE;
-      }
-      else if(parent instanceof SectionProperties)
-      {
-          newProperty = parent;
-          propertyType = SEP_TYPE;
-      }
-      else if(parent instanceof TableProperties)
-      {
-          newProperty = parent;
-          propertyType = TAP_TYPE;
-          offset = 2;//because this is really just a papx
-      }
-      else
-      {
-          return null;
-      }
-
-      while(offset < grpprl.length)
-      {
-          short sprm = LittleEndian.getShort(grpprl, offset);
-          offset += 2;
-
-          byte spra = (byte)((sprm & 0xe000) >> 13);
-          int opSize = 0;
-          int param = 0;
-          byte[] varParam = null;
-
-          switch(spra)
-          {
-              case 0:
-              case 1:
-                   opSize = 1;
-                   param = grpprl[offset];
-                   break;
-              case 2:
-                   opSize = 2;
-                   param = LittleEndian.getShort(grpprl, offset);
-                   break;
-              case 3:
-                   opSize = 4;
-                   param = LittleEndian.getInt(grpprl, offset);
-                   break;
-              case 4:
-              case 5:
-                   opSize = 2;
-                   param = LittleEndian.getShort(grpprl, offset);
-                   break;
-              case 6://variable size
-
-                   //there is one sprm that is a very special case
-                   if(sprm != (short)0xd608)
-                   {
-                     opSize = LittleEndian.getUnsignedByte(grpprl, offset);
-                     offset++;
-                   }
-                   else
-                   {
-                     opSize = LittleEndian.getShort(grpprl, offset) - 1;
-                     offset += 2;
-                   }
-                   varParam = new byte[opSize];
-                   System.arraycopy(grpprl, offset, varParam, 0, opSize);
-
-                   break;
-              case 7:
-                   opSize = 3;
-                   byte threeByteInt[] = new byte[4];
-                   threeByteInt[0] = grpprl[offset];
-                   threeByteInt[1] = grpprl[offset + 1];
-                   threeByteInt[2] = grpprl[offset + 2];
-                   threeByteInt[3] = (byte)0;
-                   param = LittleEndian.getInt(threeByteInt, 0);
-                   break;
-              default:
-                  throw new RuntimeException("unrecognized pap opcode");
-          }
-
-          offset += opSize;
-          short operand = (short)(sprm & 0x1ff);
-          byte type = (byte)((sprm & 0x1c00) >> 10);
-          switch(propertyType)
-          {
-              case PAP_TYPE:
-                   if(type == 1)//papx stores TAP sprms along with PAP sprms
-                   {
-                     doPAPOperation((ParagraphProperties)newProperty, operand,
-                                    param, varParam, grpprl,
-                                    offset, spra);
-                   }
-                   break;
-              case CHP_TYPE:
-
-                   doCHPOperation((CharacterProperties)parent,
-                                  (CharacterProperties)newProperty,
-                                  operand, param, varParam,
-                                  grpprl, offset, styleSheet);
-                   break;
-              case SEP_TYPE:
-
-                   doSEPOperation((SectionProperties)newProperty, operand, param, varParam);
-                   break;
-              case TAP_TYPE:
-                   if(type == 5)
-                   {
-                     doTAPOperation((TableProperties)newProperty, operand, param, varParam);
-                   }
-                   break;
-          }
-
-
-      }
-      return newProperty;
-
-  }
-  /**
-   * Performs an operation on a ParagraphProperties object. Used to uncompress
-   * from a papx.
-   *
-   * @param newPAP The ParagraphProperties object to perform the operation on.
-   * @param operand The operand that defines the operation.
-   * @param param The operation's parameter.
-   * @param varParam The operation's variable length parameter.
-   * @param grpprl The original papx.
-   * @param offset The current offset in the papx.
-   * @param spra A part of the sprm that defined this operation.
-   */
-  static void doPAPOperation(ParagraphProperties newPAP, int operand, int param,
-                             byte[] varParam, byte[] grpprl, int offset,
-                             int spra)
-  {
-      switch(operand)
-      {
-          case 0:
-               newPAP.setIstd(param);
-               break;
-          case 0x1:
-               //permuteIstd(newPAP, varParam);
-               break;
-          case 0x2:
-               if(newPAP.getIstd() <=9 || newPAP.getIstd() >=1)
-               {
-                  newPAP.setIstd(newPAP.getIstd() + param);
-                  if(param > 0)
-                  {
-                      newPAP.setIstd(Math.max(newPAP.getIstd(), 9));
-                  }
-                  else
-                  {
-                      newPAP.setIstd(Math.min(newPAP.getIstd(), 1));
-                  }
-               }
-               break;
-          case 0x3:
-               newPAP.setJc((byte)param);
-               break;
-          case 0x4:
-               newPAP.setFSideBySide((byte)param);
-               break;
-          case 0x5:
-               newPAP.setFKeep((byte)param);
-               break;
-          case 0x6:
-               newPAP.setFKeepFollow((byte)param);
-               break;
-          case 0x7:
-               newPAP.setFPageBreakBefore((byte)param);
-               break;
-          case 0x8:
-               newPAP.setBrcl((byte)param);
-               break;
-          case 0x9:
-               newPAP.setBrcp((byte)param);
-               break;
-          case 0xa:
-               newPAP.setIlvl((byte)param);
-               break;
-          case 0xb:
-               newPAP.setIlfo(param);
-               break;
-          case 0xc:
-               newPAP.setFNoLnn((byte)param);
-               break;
-          case 0xd:
-               /**@todo handle tabs*/
-               break;
-          case 0xe:
-               newPAP.setDxaRight(param);
-               break;
-          case 0xf:
-               newPAP.setDxaLeft(param);
-               break;
-          case 0x10:
-               newPAP.setDxaLeft(newPAP.getDxaLeft() + param);
-               newPAP.setDxaLeft(Math.max(0, newPAP.getDxaLeft()));
-               break;
-          case 0x11:
-               newPAP.setDxaLeft1(param);
-               break;
-          case 0x12:
-               short[] lspd = newPAP.getLspd();
-               lspd[0] = LittleEndian.getShort(grpprl, offset - 4);
-               lspd[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x13:
-               newPAP.setDyaBefore(param);
-               break;
-          case 0x14:
-               newPAP.setDyaAfter(param);
-               break;
-          case 0x15:
-               /**@todo handle tabs*/
-               break;
-          case 0x16:
-               newPAP.setFInTable((byte)param);
-               break;
-          case 0x17:
-               newPAP.setFTtp((byte)param);
-               break;
-          case 0x18:
-               newPAP.setDxaAbs(param);
-               break;
-          case 0x19:
-               newPAP.setDyaAbs(param);
-               break;
-          case 0x1a:
-               newPAP.setDxaWidth(param);
-               break;
-          case 0x1b:
-               /** @todo handle paragraph postioning*/
-               /*byte pcVert = (param & 0x0c) >> 2;
-               byte pcHorz = param & 0x03;
-               if(pcVert != 3)
-               {
-                  newPAP._pcVert = pcVert;
-               }
-               if(pcHorz != 3)
-               {
-                  newPAP._pcHorz = pcHorz;
-               }*/
-               break;
-          case 0x1c:
-               //newPAP.setBrcTop1((short)param);
-               break;
-          case 0x1d:
-               //newPAP.setBrcLeft1((short)param);
-               break;
-          case 0x1e:
-               //newPAP.setBrcBottom1((short)param);
-               break;
-          case 0x1f:
-               //newPAP.setBrcRight1((short)param);
-               break;
-          case 0x20:
-               //newPAP.setBrcBetween1((short)param);
-               break;
-          case 0x21:
-               //newPAP.setBrcBar1((byte)param);
-               break;
-          case 0x22:
-               newPAP.setDxaFromText(param);
-               break;
-          case 0x23:
-               newPAP.setWr((byte)param);
-               break;
-          case 0x24:
-               short[] brcTop = newPAP.getBrcTop();
-               brcTop[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcTop[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x25:
-               short[] brcLeft = newPAP.getBrcLeft();
-               brcLeft[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcLeft[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x26:
-               short[] brcBottom = newPAP.getBrcBottom();
-               brcBottom[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcBottom[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x27:
-               short[] brcRight = newPAP.getBrcRight();
-               brcRight[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcRight[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x28:
-               short[] brcBetween = newPAP.getBrcBetween();
-               brcBetween[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcBetween[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x29:
-               short[] brcBar = newPAP.getBrcBar();
-               brcBar[0] = LittleEndian.getShort(grpprl, offset - 4);
-               brcBar[1] = LittleEndian.getShort(grpprl, offset - 2);
-               break;
-          case 0x2a:
-               newPAP.setFNoAutoHyph((byte)param);
-               break;
-          case 0x2b:
-               newPAP.setDyaHeight(param);
-               break;
-          case 0x2c:
-               newPAP.setDcs((short)param);
-               break;
-          case 0x2d:
-               newPAP.setShd((short)param);
-               break;
-          case 0x2e:
-               newPAP.setDyaFromText(param);
-               break;
-          case 0x2f:
-               newPAP.setDxaFromText(param);
-               break;
-          case 0x30:
-               newPAP.setFLocked((byte)param);
-               break;
-          case 0x31:
-               newPAP.setFWidowControl((byte)param);
-               break;
-          case 0x32:
-               //undocumented
-               break;
-          case 0x33:
-               newPAP.setFKinsoku((byte)param);
-               break;
-          case 0x34:
-               newPAP.setFWordWrap((byte)param);
-               break;
-          case 0x35:
-               newPAP.setFOverflowPunct((byte)param);
-               break;
-          case 0x36:
-               newPAP.setFTopLinePunct((byte)param);
-               break;
-          case 0x37:
-               newPAP.setFAutoSpaceDE((byte)param);
-               break;
-          case 0x38:
-               newPAP.setFAutoSpaceDN((byte)param);
-               break;
-          case 0x39:
-               newPAP.setWAlignFont(param);
-               break;
-          case 0x3a:
-               newPAP.setFontAlign((short)param);
-               break;
-          case 0x3b:
-               //obsolete
-               break;
-          case 0x3e:
-               newPAP.setAnld(varParam);
-               break;
-          case 0x3f:
-               //don't really need this. spec is confusing regarding this
-               //sprm
-               break;
-          case 0x40:
-               //newPAP._lvl = param;
-               break;
-          case 0x41:
-               //?
-               break;
-          case 0x43:
-               //?
-              break;
-          case 0x44:
-               //?
-               break;
-          case 0x45:
-               if(spra == 6)
-               {
-                  newPAP.setNumrm(varParam);
-               }
-               else
-               {
-                  /**@todo handle large PAPX from data stream*/
-               }
-               break;
-
-          case 0x47:
-               newPAP.setFUsePgsuSettings((byte)param);
-               break;
-          case 0x48:
-               newPAP.setFAdjustRight((byte)param);
-               break;
-          default:
-               break;
-      }
-  }
-  /**
-   * Used to uncompress a table property. Performs an operation defined
-   * by a sprm stored in a tapx.
-   *
-   * @param newTAP The TableProperties object to perform the operation on.
-   * @param operand The operand that defines this operation.
-   * @param param The parameter for this operation.
-   * @param varParam Variable length parameter for this operation.
-   */
-  static void doTAPOperation(TableProperties newTAP, int operand, int param, byte[] varParam)
-  {
-      switch(operand)
-      {
-          case 0:
-               newTAP.setJc((short)param);
-               break;
-          case 0x01:
-          {
-               short[] rgdxaCenter = newTAP.getRgdxaCenter();
-               short itcMac = newTAP.getItcMac();
-               int adjust = param - (rgdxaCenter[0] + newTAP.getDxaGapHalf());
-               for(int x = 0; x < itcMac; x++)
-               {
-                  rgdxaCenter[x] += adjust;
-               }
-               break;
-          }
-          case 0x02:
-          {
-               short[] rgdxaCenter = newTAP.getRgdxaCenter();
-               if(rgdxaCenter != null)
-               {
-                 int adjust = newTAP.getDxaGapHalf() - param;
-                 rgdxaCenter[0] += adjust;
-               }
-               newTAP.setDxaGapHalf(param);
-               break;
-          }
-          case 0x03:
-               newTAP.setFCantSplit(getFlag(param));
-               break;
-          case 0x04:
-               newTAP.setFTableHeader(getFlag(param));
-               break;
-          case 0x05:
-          {
-               short[] brcTop = newTAP.getBrcTop();
-               short[] brcLeft = newTAP.getBrcLeft();
-               short[] brcBottom = newTAP.getBrcBottom();
-               short[] brcRight = newTAP.getBrcRight();
-               short[] brcVertical = newTAP.getBrcVertical();
-               short[] brcHorizontal = newTAP.getBrcHorizontal();
-
-               brcTop[0] = LittleEndian.getShort(varParam, 0);
-               brcTop[1] = LittleEndian.getShort(varParam, 2);
-
-               brcLeft[0] = LittleEndian.getShort(varParam, 4);
-               brcLeft[1] = LittleEndian.getShort(varParam, 6);
-
-               brcBottom[0] = LittleEndian.getShort(varParam, 8);
-               brcBottom[1] = LittleEndian.getShort(varParam, 10);
-
-               brcRight[0] = LittleEndian.getShort(varParam, 12);
-               brcRight[1] = LittleEndian.getShort(varParam, 14);
-
-               brcHorizontal[0] = LittleEndian.getShort(varParam, 16);
-               brcHorizontal[1] = LittleEndian.getShort(varParam, 18);
-
-               brcVertical[0] = LittleEndian.getShort(varParam, 20);
-               brcVertical[1] = LittleEndian.getShort(varParam, 22);
-               break;
-          }
-          case 0x06:
-               //obsolete, used in word 1.x
-               break;
-          case 0x07:
-               newTAP.setDyaRowHeight(param);
-               break;
-          case 0x08:
-          {
-               short[] rgdxaCenter = new short[varParam[0] + 1];
-               TableCellDescriptor[] rgtc = new TableCellDescriptor[varParam[0]];
-               short itcMac = varParam[0];
-               //I use varParam[0] and newTAP._itcMac interchangably
-               newTAP.setItcMac(itcMac);
-               newTAP.setRgdxaCenter(rgdxaCenter) ;
-               newTAP.setRgtc(rgtc);
-
-               for(int x = 0; x < itcMac; x++)
-               {
-                 rgdxaCenter[x] = LittleEndian.getShort(varParam , 1 + (x * 2));
-                 rgtc[x] = TableCellDescriptor.convertBytesToTC(varParam, 1 + ((itcMac + 1) * 2) + (x * 20));
-               }
-               rgdxaCenter[itcMac] = LittleEndian.getShort(varParam , 1 + (itcMac * 2));
-               break;
-          }
-          case 0x09:
-               /** @todo handle cell shading*/
-               break;
-          case 0x0a:
-               /** @todo handle word defined table styles*/
-               break;
-          case 0x20:
-          {
-               TCAbstractType[] rgtc = newTAP.getRgtc();
-
-               for(int x = varParam[0]; x < varParam[1]; x++)
-               {
-
-                 if((varParam[2] & 0x08) > 0)
-                 {
-                   short[] brcRight = rgtc[x].getBrcRight();
-                   brcRight[0] = LittleEndian.getShort(varParam, 6);
-                   brcRight[1] = LittleEndian.getShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x04) > 0)
-                 {
-                   short[] brcBottom = rgtc[x].getBrcBottom();
-                   brcBottom[0] = LittleEndian.getShort(varParam, 6);
-                   brcBottom[1] = LittleEndian.getShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x02) > 0)
-                 {
-                   short[] brcLeft = rgtc[x].getBrcLeft();
-                   brcLeft[0] = LittleEndian.getShort(varParam, 6);
-                   brcLeft[1] = LittleEndian.getShort(varParam, 8);
-                 }
-                 else if((varParam[2] & 0x01) > 0)
-                 {
-                   short[] brcTop = rgtc[x].getBrcTop();
-                   brcTop[0] = LittleEndian.getShort(varParam, 6);
-                   brcTop[1] = LittleEndian.getShort(varParam, 8);
-                 }
-               }
-               break;
-          }
-          case 0x21:
-               int index = (param & 0xff000000) >> 24;
-               int count = (param & 0x00ff0000) >> 16;
-               int width = (param & 0x0000ffff);
-               int itcMac = newTAP.getItcMac();
-
-               short[] rgdxaCenter = new short[itcMac + count + 1];
-               TableCellDescriptor[] rgtc = new TableCellDescriptor[itcMac + count];
-               if(index >= itcMac)
-               {
-                 index = itcMac;
-                 System.arraycopy(newTAP.getRgdxaCenter(), 0, rgdxaCenter, 0, itcMac + 1);
-                 System.arraycopy(newTAP.getRgtc(), 0, rgtc, 0, itcMac);
-               }
-               else
-               {
-                 //copy rgdxaCenter
-                 System.arraycopy(newTAP.getRgdxaCenter(), 0, rgdxaCenter, 0, index + 1);
-                 System.arraycopy(newTAP.getRgdxaCenter(), index + 1, rgdxaCenter, index + count, itcMac - (index));
-                 //copy rgtc
-                 System.arraycopy(newTAP.getRgtc(), 0, rgtc, 0, index);
-                 System.arraycopy(newTAP.getRgtc(), index, rgtc, index + count, itcMac - index);
-               }
-
-               for(int x = index; x < index + count; x++)
-               {
-                 rgtc[x] = new TableCellDescriptor();
-                 rgdxaCenter[x] = (short)(rgdxaCenter[x-1] + width);
-               }
-               rgdxaCenter[index + count] = (short)(rgdxaCenter[(index + count)-1] + width);
-               break;
-          /**@todo handle table sprms from complex files*/
-          case 0x22:
-          case 0x23:
-          case 0x24:
-          case 0x25:
-          case 0x26:
-          case 0x27:
-          case 0x28:
-          case 0x29:
-          case 0x2a:
-          case 0x2b:
-          case 0x2c:
-               break;
-          default:
-               break;
-      }
-  }
-  /**
-   * Used in decompression of a sepx. This performs an operation defined by
-   * a single sprm.
-   *
-   * @param newSEP The SectionProperty to perfrom the operation on.
-   * @param operand The operation to perform.
-   * @param param The operation's parameter.
-   * @param varParam The operation variable length parameter.
-   */
-  static void doSEPOperation(SectionProperties newSEP, int operand, int param, byte[] varParam)
-  {
-      switch(operand)
-      {
-          case 0:
-               newSEP.setCnsPgn((byte)param);
-               break;
-          case 0x1:
-               newSEP.setIHeadingPgn((byte)param);
-               break;
-          case 0x2:
-               newSEP.setOlstAnm(varParam);
-               break;
-          case 0x3:
-               //not quite sure
-               break;
-          case 0x4:
-               //not quite sure
-               break;
-          case 0x5:
-               newSEP.setFEvenlySpaced(getFlag(param));
-               break;
-          case 0x6:
-               newSEP.setFUnlocked(getFlag(param));
-               break;
-          case 0x7:
-               newSEP.setDmBinFirst((short)param);
-               break;
-          case 0x8:
-               newSEP.setDmBinOther((short)param);
-               break;
-          case 0x9:
-               newSEP.setBkc((byte)param);
-               break;
-          case 0xa:
-               newSEP.setFTitlePage(getFlag(param));
-               break;
-          case 0xb:
-               newSEP.setCcolM1((short)param);
-               break;
-          case 0xc:
-               newSEP.setDxaColumns(param);
-               break;
-          case 0xd:
-               newSEP.setFAutoPgn(getFlag(param));
-               break;
-          case 0xe:
-               newSEP.setNfcPgn((byte)param);
-               break;
-          case 0xf:
-               newSEP.setDyaPgn((short)param);
-               break;
-          case 0x10:
-               newSEP.setDxaPgn((short)param);
-               break;
-          case 0x11:
-               newSEP.setFPgnRestart(getFlag(param));
-               break;
-          case 0x12:
-               newSEP.setFEndNote(getFlag(param));
-               break;
-          case 0x13:
-               newSEP.setLnc((byte)param);
-               break;
-          case 0x14:
-               newSEP.setGrpfIhdt((byte)param);
-               break;
-          case 0x15:
-               newSEP.setNLnnMod((short)param);
-               break;
-          case 0x16:
-               newSEP.setDxaLnn(param);
-               break;
-          case 0x17:
-               newSEP.setDyaHdrTop(param);
-               break;
-          case 0x18:
-               newSEP.setDyaHdrBottom(param);
-               break;
-          case 0x19:
-               newSEP.setFLBetween(getFlag(param));
-               break;
-          case 0x1a:
-               newSEP.setVjc((byte)param);
-               break;
-          case 0x1b:
-               newSEP.setLnnMin((short)param);
-               break;
-          case 0x1c:
-               newSEP.setPgnStart((short)param);
-               break;
-          case 0x1d:
-               newSEP.setDmOrientPage((byte)param);
-               break;
-          case 0x1e:
-               //nothing
-               break;
-          case 0x1f:
-               newSEP.setXaPage(param);
-               break;
-          case 0x20:
-               newSEP.setYaPage(param);
-               break;
-          case 0x21:
-               newSEP.setDxaLeft(param);
-               break;
-          case 0x22:
-               newSEP.setDxaRight(param);
-               break;
-          case 0x23:
-               newSEP.setDyaTop(param);
-               break;
-          case 0x24:
-               newSEP.setDyaBottom(param);
-               break;
-          case 0x25:
-               newSEP.setDzaGutter(param);
-               break;
-          case 0x26:
-               newSEP.setDmPaperReq((short)param);
-               break;
-          case 0x27:
-               newSEP.setFPropMark(getFlag(varParam[0]));
-               break;
-          case 0x28:
-               break;
-          case 0x29:
-               break;
-          case 0x2a:
-               break;
-          case 0x2b:
-               short[] brcTop = newSEP.getBrcTop();
-               brcTop[0] = (short)(param & 0xffff);
-               brcTop[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2c:
-               short[] brcLeft = newSEP.getBrcLeft();
-               brcLeft[0] = (short)(param & 0xffff);
-               brcLeft[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2d:
-               short[] brcBottom = newSEP.getBrcBottom();
-               brcBottom[0] = (short)(param & 0xffff);
-               brcBottom[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2e:
-               short[] brcRight = newSEP.getBrcRight();
-               brcRight[0] = (short)(param & 0xffff);
-               brcRight[1] = (short)((param & 0xffff0000) >> 16);
-               break;
-          case 0x2f:
-               newSEP.setPgbProp(param);
-               break;
-          case 0x30:
-               newSEP.setDxtCharSpace(param);
-               break;
-          case 0x31:
-               newSEP.setDyaLinePitch(param);
-               break;
-          case 0x33:
-               newSEP.setWTextFlow((short)param);
-               break;
-          default:
-               break;
-      }
-
-  }
-  /**
-   * Converts an byte value into a boolean. The byte parameter can be 1,0, 128,
-   * or 129. if it is 128, this function returns the same value as oldVal. If
-   * it is 129, this function returns !oldVal. This is used for certain sprms
-   *
-   * @param x The byte value to convert.
-   * @param oldVal The old boolean value.
-   *
-   * @return A boolean whose value depends on x and oldVal.
-   */
-  private static boolean getCHPFlag(byte x, boolean oldVal)
-  {
-      switch(x)
-      {
-          case 0:
-               return false;
-          case 1:
-               return true;
-          case (byte)0x80:
-               return oldVal;
-          case (byte)0x81:
-               return !oldVal;
-          default:
-               return false;
-      }
-  }
-
-  /**
-   * Converts an int into a boolean. If the int is non-zero, it returns true.
-   * Otherwise it returns false.
-   *
-   * @param x The int to convert.
-   *
-   * @return A boolean whose value depends on x.
-   */
-  public static boolean getFlag(int x)
-  {
-      return x != 0;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
deleted file mode 100644
index bbab0ea853..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.hdf.model.hdftypes.definitions.TCAbstractType;
-import org.apache.poi.util.LittleEndian;
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TableCellDescriptor extends TCAbstractType implements HDFType
-{
-
-  /*boolean _fFirstMerged;
-  boolean _fMerged;
-  boolean _fVertical;
-  boolean _fBackward;
-  boolean _fRotateFont;
-  boolean _fVertMerge;
-  boolean _fVertRestart;
-  short _vertAlign;
-  short[] _brcTop = new short[2];
-  short[] _brcLeft = new short[2];
-  short[] _brcBottom = new short[2];
-  short[] _brcRight = new short [2];*/
-
-  public TableCellDescriptor()
-  {
-  }
-  static TableCellDescriptor convertBytesToTC(byte[] array, int offset)
-  {
-    TableCellDescriptor tc = new TableCellDescriptor();
-    int rgf = LittleEndian.getShort(array, offset);
-    tc.setFFirstMerged((rgf & 0x0001) > 0);
-    tc.setFMerged((rgf & 0x0002) > 0);
-    tc.setFVertical((rgf & 0x0004) > 0);
-    tc.setFBackward((rgf & 0x0008) > 0);
-    tc.setFRotateFont((rgf & 0x0010) > 0);
-    tc.setFVertMerge((rgf & 0x0020) > 0);
-    tc.setFVertRestart((rgf & 0x0040) > 0);
-    tc.setVertAlign((byte)((rgf & 0x0180) >> 7));
-
-    short[] brcTop = new short[2];
-    short[] brcLeft = new short[2];
-    short[] brcBottom = new short[2];
-    short[] brcRight = new short[2];
-
-    brcTop[0] = LittleEndian.getShort(array, offset + 4);
-    brcTop[1] = LittleEndian.getShort(array, offset + 6);
-
-    brcLeft[0] = LittleEndian.getShort(array, offset + 8);
-    brcLeft[1] = LittleEndian.getShort(array, offset + 10);
-
-    brcBottom[0] = LittleEndian.getShort(array, offset + 12);
-    brcBottom[1] = LittleEndian.getShort(array, offset + 14);
-
-    brcRight[0] = LittleEndian.getShort(array, offset + 16);
-    brcRight[1] = LittleEndian.getShort(array, offset + 18);
-
-    return tc;
-  }
-
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
deleted file mode 100644
index e011e5c62c..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-import org.apache.poi.hdf.model.hdftypes.definitions.TAPAbstractType;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TableProperties extends TAPAbstractType
-{
-
-
-  public TableProperties()
-  {
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
deleted file mode 100644
index ef5bea8cce..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes;
-
-
-
-/**
- * Lightweight representation of a text piece.
- *
- * @author Ryan Ackley
- */
-@Deprecated
-public final class TextPiece extends PropertyNode implements Comparable
-{
-  private boolean _usesUnicode;
-  private int _length;
-
-  /**
-   * @param start Offset in main document stream.
-   * @param length The total length of the text in bytes. Note: 1 character
-   *        does not necessarily refer to 1 byte.
-   * @param unicode true if this text is unicode.
-   */
-  public TextPiece(int start, int length, boolean unicode)
-  {
-      super(start, start + length, null);
-      _usesUnicode = unicode;
-      _length = length;
-
-  }
-  /**
-   * @return If this text piece uses unicode
-   */
-   public boolean usesUnicode()
-   {
-      return _usesUnicode;
-   }
-}
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
deleted file mode 100644
index 86fb5a825a..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
+++ /dev/null
@@ -1,1297 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Character Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class CHPAbstractType
-    implements HDFType
-{
-
-    private  short field_1_chse;
-    private  int field_2_format_flags;
-        private static BitField  fBold = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fItalic = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fRMarkDel = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fOutline = BitFieldFactory.getInstance(0x0008);
-        private static BitField  fFldVanish = BitFieldFactory.getInstance(0x0010);
-        private static BitField  fSmallCaps = BitFieldFactory.getInstance(0x0020);
-        private static BitField  fCaps = BitFieldFactory.getInstance(0x0040);
-        private static BitField  fVanish = BitFieldFactory.getInstance(0x0080);
-        private static BitField  fRMark = BitFieldFactory.getInstance(0x0100);
-        private static BitField  fSpec = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fStrike = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fObj = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fShadow = BitFieldFactory.getInstance(0x1000);
-        private static BitField  fLowerCase = BitFieldFactory.getInstance(0x2000);
-        private static BitField  fData = BitFieldFactory.getInstance(0x4000);
-        private static BitField  fOle2 = BitFieldFactory.getInstance(0x8000);
-    private  int field_3_format_flags1;
-        private static BitField  fEmboss = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fImprint = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fDStrike = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fUsePgsuSettings = BitFieldFactory.getInstance(0x0008);
-    private  int field_4_ftcAscii;
-    private  int field_5_ftcFE;
-    private  int field_6_ftcOther;
-    private  int field_7_hps;
-    private  int field_8_dxaSpace;
-    private  byte field_9_iss;
-    private  byte field_10_kul;
-    private  byte field_11_ico;
-    private  int field_12_hpsPos;
-    private  int field_13_lidDefault;
-    private  int field_14_lidFE;
-    private  byte field_15_idctHint;
-    private  int field_16_wCharScale;
-    private  int field_17_fcPic;
-    private  int field_18_fcObj;
-    private  int field_19_lTagObj;
-    private  int field_20_ibstRMark;
-    private  int field_21_ibstRMarkDel;
-    private  short[] field_22_dttmRMark;
-    private  short[] field_23_dttmRMarkDel;
-    private  int field_24_istd;
-    private  int field_25_baseIstd;
-    private  int field_26_ftcSym;
-    private  int field_27_xchSym;
-    private  int field_28_idslRMReason;
-    private  int field_29_idslReasonDel;
-    private  byte field_30_ysr;
-    private  byte field_31_chYsr;
-    private  int field_32_hpsKern;
-    private  short field_33_Highlight;
-        private static BitField  icoHighlight = BitFieldFactory.getInstance(0x001f);
-        private static BitField  fHighlight = BitFieldFactory.getInstance(0x0020);
-        private static BitField  kcd = BitFieldFactory.getInstance(0x01c0);
-        private static BitField  fNavHighlight = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fChsDiff = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fMacChs = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fFtcAsciSym = BitFieldFactory.getInstance(0x1000);
-    private  short field_34_fPropMark;
-    private  int field_35_ibstPropRMark;
-    private  int field_36_dttmPropRMark;
-    private  byte field_37_sfxtText;
-    private  byte field_38_fDispFldRMark;
-    private  int field_39_ibstDispFldRMark;
-    private  int field_40_dttmDispFldRMark;
-    private  byte[] field_41_xstDispFldRMark;
-    private  int field_42_shd;
-    private  short[] field_43_brc;
-
-
-    public CHPAbstractType()
-    {
-
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 1 + 2 + 2 + 2 + 1 + 2 + 4 + 4 + 4 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 2 + 4 + 32 + 2 + 4;
-    }
-
-
-
-    /**
-     * Get the chse field for the CHP record.
-     */
-    public short getChse()
-    {
-        return field_1_chse;
-    }
-
-    /**
-     * Set the chse field for the CHP record.
-     */
-    public void setChse(short field_1_chse)
-    {
-        this.field_1_chse = field_1_chse;
-    }
-
-    /**
-     * Get the format_flags field for the CHP record.
-     */
-    public int getFormat_flags()
-    {
-        return field_2_format_flags;
-    }
-
-    /**
-     * Set the format_flags field for the CHP record.
-     */
-    public void setFormat_flags(int field_2_format_flags)
-    {
-        this.field_2_format_flags = field_2_format_flags;
-    }
-
-    /**
-     * Get the format_flags1 field for the CHP record.
-     */
-    public int getFormat_flags1()
-    {
-        return field_3_format_flags1;
-    }
-
-    /**
-     * Set the format_flags1 field for the CHP record.
-     */
-    public void setFormat_flags1(int field_3_format_flags1)
-    {
-        this.field_3_format_flags1 = field_3_format_flags1;
-    }
-
-    /**
-     * Get the ftcAscii field for the CHP record.
-     */
-    public int getFtcAscii()
-    {
-        return field_4_ftcAscii;
-    }
-
-    /**
-     * Set the ftcAscii field for the CHP record.
-     */
-    public void setFtcAscii(int field_4_ftcAscii)
-    {
-        this.field_4_ftcAscii = field_4_ftcAscii;
-    }
-
-    /**
-     * Get the ftcFE field for the CHP record.
-     */
-    public int getFtcFE()
-    {
-        return field_5_ftcFE;
-    }
-
-    /**
-     * Set the ftcFE field for the CHP record.
-     */
-    public void setFtcFE(int field_5_ftcFE)
-    {
-        this.field_5_ftcFE = field_5_ftcFE;
-    }
-
-    /**
-     * Get the ftcOther field for the CHP record.
-     */
-    public int getFtcOther()
-    {
-        return field_6_ftcOther;
-    }
-
-    /**
-     * Set the ftcOther field for the CHP record.
-     */
-    public void setFtcOther(int field_6_ftcOther)
-    {
-        this.field_6_ftcOther = field_6_ftcOther;
-    }
-
-    /**
-     * Get the hps field for the CHP record.
-     */
-    public int getHps()
-    {
-        return field_7_hps;
-    }
-
-    /**
-     * Set the hps field for the CHP record.
-     */
-    public void setHps(int field_7_hps)
-    {
-        this.field_7_hps = field_7_hps;
-    }
-
-    /**
-     * Get the dxaSpace field for the CHP record.
-     */
-    public int getDxaSpace()
-    {
-        return field_8_dxaSpace;
-    }
-
-    /**
-     * Set the dxaSpace field for the CHP record.
-     */
-    public void setDxaSpace(int field_8_dxaSpace)
-    {
-        this.field_8_dxaSpace = field_8_dxaSpace;
-    }
-
-    /**
-     * Get the iss field for the CHP record.
-     */
-    public byte getIss()
-    {
-        return field_9_iss;
-    }
-
-    /**
-     * Set the iss field for the CHP record.
-     */
-    public void setIss(byte field_9_iss)
-    {
-        this.field_9_iss = field_9_iss;
-    }
-
-    /**
-     * Get the kul field for the CHP record.
-     */
-    public byte getKul()
-    {
-        return field_10_kul;
-    }
-
-    /**
-     * Set the kul field for the CHP record.
-     */
-    public void setKul(byte field_10_kul)
-    {
-        this.field_10_kul = field_10_kul;
-    }
-
-    /**
-     * Get the ico field for the CHP record.
-     */
-    public byte getIco()
-    {
-        return field_11_ico;
-    }
-
-    /**
-     * Set the ico field for the CHP record.
-     */
-    public void setIco(byte field_11_ico)
-    {
-        this.field_11_ico = field_11_ico;
-    }
-
-    /**
-     * Get the hpsPos field for the CHP record.
-     */
-    public int getHpsPos()
-    {
-        return field_12_hpsPos;
-    }
-
-    /**
-     * Set the hpsPos field for the CHP record.
-     */
-    public void setHpsPos(int field_12_hpsPos)
-    {
-        this.field_12_hpsPos = field_12_hpsPos;
-    }
-
-    /**
-     * Get the lidDefault field for the CHP record.
-     */
-    public int getLidDefault()
-    {
-        return field_13_lidDefault;
-    }
-
-    /**
-     * Set the lidDefault field for the CHP record.
-     */
-    public void setLidDefault(int field_13_lidDefault)
-    {
-        this.field_13_lidDefault = field_13_lidDefault;
-    }
-
-    /**
-     * Get the lidFE field for the CHP record.
-     */
-    public int getLidFE()
-    {
-        return field_14_lidFE;
-    }
-
-    /**
-     * Set the lidFE field for the CHP record.
-     */
-    public void setLidFE(int field_14_lidFE)
-    {
-        this.field_14_lidFE = field_14_lidFE;
-    }
-
-    /**
-     * Get the idctHint field for the CHP record.
-     */
-    public byte getIdctHint()
-    {
-        return field_15_idctHint;
-    }
-
-    /**
-     * Set the idctHint field for the CHP record.
-     */
-    public void setIdctHint(byte field_15_idctHint)
-    {
-        this.field_15_idctHint = field_15_idctHint;
-    }
-
-    /**
-     * Get the wCharScale field for the CHP record.
-     */
-    public int getWCharScale()
-    {
-        return field_16_wCharScale;
-    }
-
-    /**
-     * Set the wCharScale field for the CHP record.
-     */
-    public void setWCharScale(int field_16_wCharScale)
-    {
-        this.field_16_wCharScale = field_16_wCharScale;
-    }
-
-    /**
-     * Get the fcPic field for the CHP record.
-     */
-    public int getFcPic()
-    {
-        return field_17_fcPic;
-    }
-
-    /**
-     * Set the fcPic field for the CHP record.
-     */
-    public void setFcPic(int field_17_fcPic)
-    {
-        this.field_17_fcPic = field_17_fcPic;
-    }
-
-    /**
-     * Get the fcObj field for the CHP record.
-     */
-    public int getFcObj()
-    {
-        return field_18_fcObj;
-    }
-
-    /**
-     * Set the fcObj field for the CHP record.
-     */
-    public void setFcObj(int field_18_fcObj)
-    {
-        this.field_18_fcObj = field_18_fcObj;
-    }
-
-    /**
-     * Get the lTagObj field for the CHP record.
-     */
-    public int getLTagObj()
-    {
-        return field_19_lTagObj;
-    }
-
-    /**
-     * Set the lTagObj field for the CHP record.
-     */
-    public void setLTagObj(int field_19_lTagObj)
-    {
-        this.field_19_lTagObj = field_19_lTagObj;
-    }
-
-    /**
-     * Get the ibstRMark field for the CHP record.
-     */
-    public int getIbstRMark()
-    {
-        return field_20_ibstRMark;
-    }
-
-    /**
-     * Set the ibstRMark field for the CHP record.
-     */
-    public void setIbstRMark(int field_20_ibstRMark)
-    {
-        this.field_20_ibstRMark = field_20_ibstRMark;
-    }
-
-    /**
-     * Get the ibstRMarkDel field for the CHP record.
-     */
-    public int getIbstRMarkDel()
-    {
-        return field_21_ibstRMarkDel;
-    }
-
-    /**
-     * Set the ibstRMarkDel field for the CHP record.
-     */
-    public void setIbstRMarkDel(int field_21_ibstRMarkDel)
-    {
-        this.field_21_ibstRMarkDel = field_21_ibstRMarkDel;
-    }
-
-    /**
-     * Get the dttmRMark field for the CHP record.
-     */
-    public short[] getDttmRMark()
-    {
-        return field_22_dttmRMark;
-    }
-
-    /**
-     * Set the dttmRMark field for the CHP record.
-     */
-    public void setDttmRMark(short[] field_22_dttmRMark)
-    {
-        this.field_22_dttmRMark = field_22_dttmRMark;
-    }
-
-    /**
-     * Get the dttmRMarkDel field for the CHP record.
-     */
-    public short[] getDttmRMarkDel()
-    {
-        return field_23_dttmRMarkDel;
-    }
-
-    /**
-     * Set the dttmRMarkDel field for the CHP record.
-     */
-    public void setDttmRMarkDel(short[] field_23_dttmRMarkDel)
-    {
-        this.field_23_dttmRMarkDel = field_23_dttmRMarkDel;
-    }
-
-    /**
-     * Get the istd field for the CHP record.
-     */
-    public int getIstd()
-    {
-        return field_24_istd;
-    }
-
-    /**
-     * Set the istd field for the CHP record.
-     */
-    public void setIstd(int field_24_istd)
-    {
-        this.field_24_istd = field_24_istd;
-    }
-
-    /**
-     * Get the baseIstd field for the CHP record.
-     */
-    public int getBaseIstd()
-    {
-        return field_25_baseIstd;
-    }
-
-    /**
-     * Set the baseIstd field for the CHP record.
-     */
-    public void setBaseIstd(int field_25_baseIstd)
-    {
-        this.field_25_baseIstd = field_25_baseIstd;
-    }
-
-    /**
-     * Get the ftcSym field for the CHP record.
-     */
-    public int getFtcSym()
-    {
-        return field_26_ftcSym;
-    }
-
-    /**
-     * Set the ftcSym field for the CHP record.
-     */
-    public void setFtcSym(int field_26_ftcSym)
-    {
-        this.field_26_ftcSym = field_26_ftcSym;
-    }
-
-    /**
-     * Get the xchSym field for the CHP record.
-     */
-    public int getXchSym()
-    {
-        return field_27_xchSym;
-    }
-
-    /**
-     * Set the xchSym field for the CHP record.
-     */
-    public void setXchSym(int field_27_xchSym)
-    {
-        this.field_27_xchSym = field_27_xchSym;
-    }
-
-    /**
-     * Get the idslRMReason field for the CHP record.
-     */
-    public int getIdslRMReason()
-    {
-        return field_28_idslRMReason;
-    }
-
-    /**
-     * Set the idslRMReason field for the CHP record.
-     */
-    public void setIdslRMReason(int field_28_idslRMReason)
-    {
-        this.field_28_idslRMReason = field_28_idslRMReason;
-    }
-
-    /**
-     * Get the idslReasonDel field for the CHP record.
-     */
-    public int getIdslReasonDel()
-    {
-        return field_29_idslReasonDel;
-    }
-
-    /**
-     * Set the idslReasonDel field for the CHP record.
-     */
-    public void setIdslReasonDel(int field_29_idslReasonDel)
-    {
-        this.field_29_idslReasonDel = field_29_idslReasonDel;
-    }
-
-    /**
-     * Get the ysr field for the CHP record.
-     */
-    public byte getYsr()
-    {
-        return field_30_ysr;
-    }
-
-    /**
-     * Set the ysr field for the CHP record.
-     */
-    public void setYsr(byte field_30_ysr)
-    {
-        this.field_30_ysr = field_30_ysr;
-    }
-
-    /**
-     * Get the chYsr field for the CHP record.
-     */
-    public byte getChYsr()
-    {
-        return field_31_chYsr;
-    }
-
-    /**
-     * Set the chYsr field for the CHP record.
-     */
-    public void setChYsr(byte field_31_chYsr)
-    {
-        this.field_31_chYsr = field_31_chYsr;
-    }
-
-    /**
-     * Get the hpsKern field for the CHP record.
-     */
-    public int getHpsKern()
-    {
-        return field_32_hpsKern;
-    }
-
-    /**
-     * Set the hpsKern field for the CHP record.
-     */
-    public void setHpsKern(int field_32_hpsKern)
-    {
-        this.field_32_hpsKern = field_32_hpsKern;
-    }
-
-    /**
-     * Get the Highlight field for the CHP record.
-     */
-    public short getHighlight()
-    {
-        return field_33_Highlight;
-    }
-
-    /**
-     * Set the Highlight field for the CHP record.
-     */
-    public void setHighlight(short field_33_Highlight)
-    {
-        this.field_33_Highlight = field_33_Highlight;
-    }
-
-    /**
-     * Get the fPropMark field for the CHP record.
-     */
-    public short getFPropMark()
-    {
-        return field_34_fPropMark;
-    }
-
-    /**
-     * Set the fPropMark field for the CHP record.
-     */
-    public void setFPropMark(short field_34_fPropMark)
-    {
-        this.field_34_fPropMark = field_34_fPropMark;
-    }
-
-    /**
-     * Get the ibstPropRMark field for the CHP record.
-     */
-    public int getIbstPropRMark()
-    {
-        return field_35_ibstPropRMark;
-    }
-
-    /**
-     * Set the ibstPropRMark field for the CHP record.
-     */
-    public void setIbstPropRMark(int field_35_ibstPropRMark)
-    {
-        this.field_35_ibstPropRMark = field_35_ibstPropRMark;
-    }
-
-    /**
-     * Get the dttmPropRMark field for the CHP record.
-     */
-    public int getDttmPropRMark()
-    {
-        return field_36_dttmPropRMark;
-    }
-
-    /**
-     * Set the dttmPropRMark field for the CHP record.
-     */
-    public void setDttmPropRMark(int field_36_dttmPropRMark)
-    {
-        this.field_36_dttmPropRMark = field_36_dttmPropRMark;
-    }
-
-    /**
-     * Get the sfxtText field for the CHP record.
-     */
-    public byte getSfxtText()
-    {
-        return field_37_sfxtText;
-    }
-
-    /**
-     * Set the sfxtText field for the CHP record.
-     */
-    public void setSfxtText(byte field_37_sfxtText)
-    {
-        this.field_37_sfxtText = field_37_sfxtText;
-    }
-
-    /**
-     * Get the fDispFldRMark field for the CHP record.
-     */
-    public byte getFDispFldRMark()
-    {
-        return field_38_fDispFldRMark;
-    }
-
-    /**
-     * Set the fDispFldRMark field for the CHP record.
-     */
-    public void setFDispFldRMark(byte field_38_fDispFldRMark)
-    {
-        this.field_38_fDispFldRMark = field_38_fDispFldRMark;
-    }
-
-    /**
-     * Get the ibstDispFldRMark field for the CHP record.
-     */
-    public int getIbstDispFldRMark()
-    {
-        return field_39_ibstDispFldRMark;
-    }
-
-    /**
-     * Set the ibstDispFldRMark field for the CHP record.
-     */
-    public void setIbstDispFldRMark(int field_39_ibstDispFldRMark)
-    {
-        this.field_39_ibstDispFldRMark = field_39_ibstDispFldRMark;
-    }
-
-    /**
-     * Get the dttmDispFldRMark field for the CHP record.
-     */
-    public int getDttmDispFldRMark()
-    {
-        return field_40_dttmDispFldRMark;
-    }
-
-    /**
-     * Set the dttmDispFldRMark field for the CHP record.
-     */
-    public void setDttmDispFldRMark(int field_40_dttmDispFldRMark)
-    {
-        this.field_40_dttmDispFldRMark = field_40_dttmDispFldRMark;
-    }
-
-    /**
-     * Get the xstDispFldRMark field for the CHP record.
-     */
-    public byte[] getXstDispFldRMark()
-    {
-        return field_41_xstDispFldRMark;
-    }
-
-    /**
-     * Set the xstDispFldRMark field for the CHP record.
-     */
-    public void setXstDispFldRMark(byte[] field_41_xstDispFldRMark)
-    {
-        this.field_41_xstDispFldRMark = field_41_xstDispFldRMark;
-    }
-
-    /**
-     * Get the shd field for the CHP record.
-     */
-    public int getShd()
-    {
-        return field_42_shd;
-    }
-
-    /**
-     * Set the shd field for the CHP record.
-     */
-    public void setShd(int field_42_shd)
-    {
-        this.field_42_shd = field_42_shd;
-    }
-
-    /**
-     * Get the brc field for the CHP record.
-     */
-    public short[] getBrc()
-    {
-        return field_43_brc;
-    }
-
-    /**
-     * Set the brc field for the CHP record.
-     */
-    public void setBrc(short[] field_43_brc)
-    {
-        this.field_43_brc = field_43_brc;
-    }
-
-    /**
-     * Sets the fBold field value.
-     *
-     */
-    public void setFBold(boolean value)
-    {
-        field_2_format_flags = fBold.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fBold field value.
-     */
-    public boolean isFBold()
-    {
-        return fBold.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fItalic field value.
-     *
-     */
-    public void setFItalic(boolean value)
-    {
-        field_2_format_flags = fItalic.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fItalic field value.
-     */
-    public boolean isFItalic()
-    {
-        return fItalic.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fRMarkDel field value.
-     *
-     */
-    public void setFRMarkDel(boolean value)
-    {
-        field_2_format_flags = fRMarkDel.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fRMarkDel field value.
-     */
-    public boolean isFRMarkDel()
-    {
-        return fRMarkDel.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fOutline field value.
-     *
-     */
-    public void setFOutline(boolean value)
-    {
-        field_2_format_flags = fOutline.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fOutline field value.
-     */
-    public boolean isFOutline()
-    {
-        return fOutline.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fFldVanish field value.
-     *
-     */
-    public void setFFldVanish(boolean value)
-    {
-        field_2_format_flags = fFldVanish.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fFldVanish field value.
-     */
-    public boolean isFFldVanish()
-    {
-        return fFldVanish.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fSmallCaps field value.
-     *
-     */
-    public void setFSmallCaps(boolean value)
-    {
-        field_2_format_flags = fSmallCaps.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fSmallCaps field value.
-     */
-    public boolean isFSmallCaps()
-    {
-        return fSmallCaps.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fCaps field value.
-     *
-     */
-    public void setFCaps(boolean value)
-    {
-        field_2_format_flags = fCaps.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fCaps field value.
-     */
-    public boolean isFCaps()
-    {
-        return fCaps.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fVanish field value.
-     *
-     */
-    public void setFVanish(boolean value)
-    {
-        field_2_format_flags = fVanish.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fVanish field value.
-     */
-    public boolean isFVanish()
-    {
-        return fVanish.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fRMark field value.
-     *
-     */
-    public void setFRMark(boolean value)
-    {
-        field_2_format_flags = fRMark.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fRMark field value.
-     */
-    public boolean isFRMark()
-    {
-        return fRMark.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fSpec field value.
-     *
-     */
-    public void setFSpec(boolean value)
-    {
-        field_2_format_flags = fSpec.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fSpec field value.
-     */
-    public boolean isFSpec()
-    {
-        return fSpec.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fStrike field value.
-     *
-     */
-    public void setFStrike(boolean value)
-    {
-        field_2_format_flags = fStrike.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fStrike field value.
-     */
-    public boolean isFStrike()
-    {
-        return fStrike.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fObj field value.
-     *
-     */
-    public void setFObj(boolean value)
-    {
-        field_2_format_flags = fObj.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fObj field value.
-     */
-    public boolean isFObj()
-    {
-        return fObj.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fShadow field value.
-     *
-     */
-    public void setFShadow(boolean value)
-    {
-        field_2_format_flags = fShadow.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fShadow field value.
-     */
-    public boolean isFShadow()
-    {
-        return fShadow.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fLowerCase field value.
-     *
-     */
-    public void setFLowerCase(boolean value)
-    {
-        field_2_format_flags = fLowerCase.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fLowerCase field value.
-     */
-    public boolean isFLowerCase()
-    {
-        return fLowerCase.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fData field value.
-     *
-     */
-    public void setFData(boolean value)
-    {
-        field_2_format_flags = fData.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fData field value.
-     */
-    public boolean isFData()
-    {
-        return fData.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fOle2 field value.
-     *
-     */
-    public void setFOle2(boolean value)
-    {
-        field_2_format_flags = fOle2.setBoolean(field_2_format_flags, value);
-    }
-
-    /**
-     *
-     * @return  the fOle2 field value.
-     */
-    public boolean isFOle2()
-    {
-        return fOle2.isSet(field_2_format_flags);
-    }
-
-    /**
-     * Sets the fEmboss field value.
-     *
-     */
-    public void setFEmboss(boolean value)
-    {
-        field_3_format_flags1 = fEmboss.setBoolean(field_3_format_flags1, value);
-    }
-
-    /**
-     *
-     * @return  the fEmboss field value.
-     */
-    public boolean isFEmboss()
-    {
-        return fEmboss.isSet(field_3_format_flags1);
-    }
-
-    /**
-     * Sets the fImprint field value.
-     *
-     */
-    public void setFImprint(boolean value)
-    {
-        field_3_format_flags1 = fImprint.setBoolean(field_3_format_flags1, value);
-    }
-
-    /**
-     *
-     * @return  the fImprint field value.
-     */
-    public boolean isFImprint()
-    {
-        return fImprint.isSet(field_3_format_flags1);
-    }
-
-    /**
-     * Sets the fDStrike field value.
-     *
-     */
-    public void setFDStrike(boolean value)
-    {
-        field_3_format_flags1 = fDStrike.setBoolean(field_3_format_flags1, value);
-    }
-
-    /**
-     *
-     * @return  the fDStrike field value.
-     */
-    public boolean isFDStrike()
-    {
-        return fDStrike.isSet(field_3_format_flags1);
-    }
-
-    /**
-     * Sets the fUsePgsuSettings field value.
-     *
-     */
-    public void setFUsePgsuSettings(boolean value)
-    {
-        field_3_format_flags1 = fUsePgsuSettings.setBoolean(field_3_format_flags1, value);
-    }
-
-    /**
-     *
-     * @return  the fUsePgsuSettings field value.
-     */
-    public boolean isFUsePgsuSettings()
-    {
-        return fUsePgsuSettings.isSet(field_3_format_flags1);
-    }
-
-    /**
-     * Sets the icoHighlight field value.
-     *
-     */
-    public void setIcoHighlight(byte value)
-    {
-        field_33_Highlight = (short)icoHighlight.setValue(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the icoHighlight field value.
-     */
-    public byte getIcoHighlight()
-    {
-        return ( byte )icoHighlight.getValue(field_33_Highlight);
-    }
-
-    /**
-     * Sets the fHighlight field value.
-     *
-     */
-    public void setFHighlight(boolean value)
-    {
-        field_33_Highlight = (short)fHighlight.setBoolean(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the fHighlight field value.
-     */
-    public boolean isFHighlight()
-    {
-        return fHighlight.isSet(field_33_Highlight);
-    }
-
-    /**
-     * Sets the kcd field value.
-     *
-     */
-    public void setKcd(byte value)
-    {
-        field_33_Highlight = (short)kcd.setValue(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the kcd field value.
-     */
-    public byte getKcd()
-    {
-        return ( byte )kcd.getValue(field_33_Highlight);
-    }
-
-    /**
-     * Sets the fNavHighlight field value.
-     *
-     */
-    public void setFNavHighlight(boolean value)
-    {
-        field_33_Highlight = (short)fNavHighlight.setBoolean(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the fNavHighlight field value.
-     */
-    public boolean isFNavHighlight()
-    {
-        return fNavHighlight.isSet(field_33_Highlight);
-    }
-
-    /**
-     * Sets the fChsDiff field value.
-     *
-     */
-    public void setFChsDiff(boolean value)
-    {
-        field_33_Highlight = (short)fChsDiff.setBoolean(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the fChsDiff field value.
-     */
-    public boolean isFChsDiff()
-    {
-        return fChsDiff.isSet(field_33_Highlight);
-    }
-
-    /**
-     * Sets the fMacChs field value.
-     *
-     */
-    public void setFMacChs(boolean value)
-    {
-        field_33_Highlight = (short)fMacChs.setBoolean(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the fMacChs field value.
-     */
-    public boolean isFMacChs()
-    {
-        return fMacChs.isSet(field_33_Highlight);
-    }
-
-    /**
-     * Sets the fFtcAsciSym field value.
-     *
-     */
-    public void setFFtcAsciSym(boolean value)
-    {
-        field_33_Highlight = (short)fFtcAsciSym.setBoolean(field_33_Highlight, value);
-    }
-
-    /**
-     *
-     * @return  the fFtcAsciSym field value.
-     */
-    public boolean isFFtcAsciSym()
-    {
-        return fFtcAsciSym.isSet(field_33_Highlight);
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
deleted file mode 100644
index 0c0ca4e25b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
+++ /dev/null
@@ -1,3135 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-
-
-import java.util.Arrays;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Document Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class DOPAbstractType
-    implements HDFType
-{
-
-    private  byte field_1_formatFlags;
-        private static BitField  fFacingPages = BitFieldFactory.getInstance(0x01);
-        private static BitField  fWidowControl = BitFieldFactory.getInstance(0x02);
-        private static BitField  fPMHMainDoc = BitFieldFactory.getInstance(0x04);
-        private static BitField  grfSupression = BitFieldFactory.getInstance(0x18);
-        private static BitField  fpc = BitFieldFactory.getInstance(0x60);
-        private static BitField  unused1 = BitFieldFactory.getInstance(0x80);
-    private  byte field_2_unused2;
-    private  short field_3_footnoteInfo;
-        private static BitField  rncFtn = BitFieldFactory.getInstance(0x0003);
-        private static BitField  nFtn = BitFieldFactory.getInstance(0xfffc);
-    private  byte field_4_fOutlineDirtySave;
-    private  byte field_5_docinfo;
-        private static BitField  fOnlyMacPics = BitFieldFactory.getInstance(0x01);
-        private static BitField  fOnlyWinPics = BitFieldFactory.getInstance(0x02);
-        private static BitField  fLabelDoc = BitFieldFactory.getInstance(0x04);
-        private static BitField  fHyphCapitals = BitFieldFactory.getInstance(0x08);
-        private static BitField  fAutoHyphen = BitFieldFactory.getInstance(0x10);
-        private static BitField  fFormNoFields = BitFieldFactory.getInstance(0x20);
-        private static BitField  fLinkStyles = BitFieldFactory.getInstance(0x40);
-        private static BitField  fRevMarking = BitFieldFactory.getInstance(0x80);
-    private  byte field_6_docinfo1;
-        private static BitField  fBackup = BitFieldFactory.getInstance(0x01);
-        private static BitField  fExactCWords = BitFieldFactory.getInstance(0x02);
-        private static BitField  fPagHidden = BitFieldFactory.getInstance(0x04);
-        private static BitField  fPagResults = BitFieldFactory.getInstance(0x08);
-        private static BitField  fLockAtn = BitFieldFactory.getInstance(0x10);
-        private static BitField  fMirrorMargins = BitFieldFactory.getInstance(0x20);
-        private static BitField  unused3 = BitFieldFactory.getInstance(0x40);
-        private static BitField  fDfltTrueType = BitFieldFactory.getInstance(0x80);
-    private  byte field_7_docinfo2;
-        private static BitField  fPagSupressTopSpacing = BitFieldFactory.getInstance(0x01);
-        private static BitField  fProtEnabled = BitFieldFactory.getInstance(0x02);
-        private static BitField  fDispFormFldSel = BitFieldFactory.getInstance(0x04);
-        private static BitField  fRMView = BitFieldFactory.getInstance(0x08);
-        private static BitField  fRMPrint = BitFieldFactory.getInstance(0x10);
-        private static BitField  unused4 = BitFieldFactory.getInstance(0x20);
-        private static BitField  fLockRev = BitFieldFactory.getInstance(0x40);
-        private static BitField  fEmbedFonts = BitFieldFactory.getInstance(0x80);
-    private  short field_8_docinfo3;
-        private static BitField  oldfNoTabForInd = BitFieldFactory.getInstance(0x0001);
-        private static BitField  oldfNoSpaceRaiseLower = BitFieldFactory.getInstance(0x0002);
-        private static BitField  oldfSuppressSpbfAfterPageBreak = BitFieldFactory.getInstance(0x0004);
-        private static BitField  oldfWrapTrailSpaces = BitFieldFactory.getInstance(0x0008);
-        private static BitField  oldfMapPrintTextColor = BitFieldFactory.getInstance(0x0010);
-        private static BitField  oldfNoColumnBalance = BitFieldFactory.getInstance(0x0020);
-        private static BitField  oldfConvMailMergeEsc = BitFieldFactory.getInstance(0x0040);
-        private static BitField  oldfSupressTopSpacing = BitFieldFactory.getInstance(0x0080);
-        private static BitField  oldfOrigWordTableRules = BitFieldFactory.getInstance(0x0100);
-        private static BitField  oldfTransparentMetafiles = BitFieldFactory.getInstance(0x0200);
-        private static BitField  oldfShowBreaksInFrames = BitFieldFactory.getInstance(0x0400);
-        private static BitField  oldfSwapBordersFacingPgs = BitFieldFactory.getInstance(0x0800);
-        private static BitField  unused5 = BitFieldFactory.getInstance(0xf000);
-    private  int field_9_dxaTab;
-    private  int field_10_wSpare;
-    private  int field_11_dxaHotz;
-    private  int field_12_cConsexHypLim;
-    private  int field_13_wSpare2;
-    private  int field_14_dttmCreated;
-    private  int field_15_dttmRevised;
-    private  int field_16_dttmLastPrint;
-    private  int field_17_nRevision;
-    private  int field_18_tmEdited;
-    private  int field_19_cWords;
-    private  int field_20_cCh;
-    private  int field_21_cPg;
-    private  int field_22_cParas;
-    private  short field_23_Edn;
-        private static BitField  rncEdn = BitFieldFactory.getInstance(0x0003);
-        private static BitField  nEdn = BitFieldFactory.getInstance(0xfffc);
-    private  short field_24_Edn1;
-        private static BitField  epc = BitFieldFactory.getInstance(0x0003);
-        private static BitField  nfcFtnRef1 = BitFieldFactory.getInstance(0x003c);
-        private static BitField  nfcEdnRef1 = BitFieldFactory.getInstance(0x03c0);
-        private static BitField  fPrintFormData = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fSaveFormData = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fShadeFormData = BitFieldFactory.getInstance(0x1000);
-        private static BitField  fWCFtnEdn = BitFieldFactory.getInstance(0x8000);
-    private  int field_25_cLines;
-    private  int field_26_cWordsFtnEnd;
-    private  int field_27_cChFtnEdn;
-    private  short field_28_cPgFtnEdn;
-    private  int field_29_cParasFtnEdn;
-    private  int field_30_cLinesFtnEdn;
-    private  int field_31_lKeyProtDoc;
-    private  short field_32_view;
-        private static BitField  wvkSaved = BitFieldFactory.getInstance(0x0007);
-        private static BitField  wScaleSaved = BitFieldFactory.getInstance(0x0ff8);
-        private static BitField  zkSaved = BitFieldFactory.getInstance(0x3000);
-        private static BitField  fRotateFontW6 = BitFieldFactory.getInstance(0x4000);
-        private static BitField  iGutterPos = BitFieldFactory.getInstance(0x8000);
-    private  int field_33_docinfo4;
-        private static BitField  fNoTabForInd = BitFieldFactory.getInstance(0x00000001);
-        private static BitField  fNoSpaceRaiseLower = BitFieldFactory.getInstance(0x00000002);
-        private static BitField  fSupressSpdfAfterPageBreak = BitFieldFactory.getInstance(0x00000004);
-        private static BitField  fWrapTrailSpaces = BitFieldFactory.getInstance(0x00000008);
-        private static BitField  fMapPrintTextColor = BitFieldFactory.getInstance(0x00000010);
-        private static BitField  fNoColumnBalance = BitFieldFactory.getInstance(0x00000020);
-        private static BitField  fConvMailMergeEsc = BitFieldFactory.getInstance(0x00000040);
-        private static BitField  fSupressTopSpacing = BitFieldFactory.getInstance(0x00000080);
-        private static BitField  fOrigWordTableRules = BitFieldFactory.getInstance(0x00000100);
-        private static BitField  fTransparentMetafiles = BitFieldFactory.getInstance(0x00000200);
-        private static BitField  fShowBreaksInFrames = BitFieldFactory.getInstance(0x00000400);
-        private static BitField  fSwapBordersFacingPgs = BitFieldFactory.getInstance(0x00000800);
-        private static BitField  fSuppressTopSPacingMac5 = BitFieldFactory.getInstance(0x00010000);
-        private static BitField  fTruncDxaExpand = BitFieldFactory.getInstance(0x00020000);
-        private static BitField  fPrintBodyBeforeHdr = BitFieldFactory.getInstance(0x00040000);
-        private static BitField  fNoLeading = BitFieldFactory.getInstance(0x00080000);
-        private static BitField  fMWSmallCaps = BitFieldFactory.getInstance(0x00200000);
-    private  short field_34_adt;
-    private  byte[] field_35_doptypography;
-    private  byte[] field_36_dogrid;
-    private  short field_37_docinfo5;
-        private static BitField  lvl = BitFieldFactory.getInstance(0x001e);
-        private static BitField  fGramAllDone = BitFieldFactory.getInstance(0x0020);
-        private static BitField  fGramAllClean = BitFieldFactory.getInstance(0x0040);
-        private static BitField  fSubsetFonts = BitFieldFactory.getInstance(0x0080);
-        private static BitField  fHideLastVersion = BitFieldFactory.getInstance(0x0100);
-        private static BitField  fHtmlDoc = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fSnapBorder = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fIncludeHeader = BitFieldFactory.getInstance(0x1000);
-        private static BitField  fIncludeFooter = BitFieldFactory.getInstance(0x2000);
-        private static BitField  fForcePageSizePag = BitFieldFactory.getInstance(0x4000);
-        private static BitField  fMinFontSizePag = BitFieldFactory.getInstance(0x8000);
-    private  short field_38_docinfo6;
-        private static BitField  fHaveVersions = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fAutoVersions = BitFieldFactory.getInstance(0x0002);
-    private  byte[] field_39_asumyi;
-    private  int field_40_cChWS;
-    private  int field_41_cChWSFtnEdn;
-    private  int field_42_grfDocEvents;
-    private  int field_43_virusinfo;
-        private static BitField  fVirusPrompted = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fVirusLoadSafe = BitFieldFactory.getInstance(0x0002);
-        private static BitField  KeyVirusSession30 = BitFieldFactory.getInstance(0xfffffffc);
-    private  byte[] field_44_Spare;
-    private  int field_45_reserved1;
-    private  int field_46_reserved2;
-    private  int field_47_cDBC;
-    private  int field_48_cDBCFtnEdn;
-    private  int field_49_reserved;
-    private  short field_50_nfcFtnRef;
-    private  short field_51_nfcEdnRef;
-    private  short field_52_hpsZoonFontPag;
-    private  short field_53_dywDispPag;
-
-
-    public DOPAbstractType()
-    {
-
-    }
-
-    protected void fillFields(byte [] data, short size, int offset)
-    {
-        field_1_formatFlags             = data[ 0x0 + offset ];
-        field_2_unused2                 = data[ 0x1 + offset ];
-        field_3_footnoteInfo            = LittleEndian.getShort(data, 0x2 + offset);
-        field_4_fOutlineDirtySave       = data[ 0x4 + offset ];
-        field_5_docinfo                 = data[ 0x5 + offset ];
-        field_6_docinfo1                = data[ 0x6 + offset ];
-        field_7_docinfo2                = data[ 0x7 + offset ];
-        field_8_docinfo3                = LittleEndian.getShort(data, 0x8 + offset);
-        field_9_dxaTab                  = LittleEndian.getShort(data, 0xa + offset);
-        field_10_wSpare                 = LittleEndian.getShort(data, 0xc + offset);
-        field_11_dxaHotz                = LittleEndian.getShort(data, 0xe + offset);
-        field_12_cConsexHypLim          = LittleEndian.getShort(data, 0x10 + offset);
-        field_13_wSpare2                = LittleEndian.getShort(data, 0x12 + offset);
-        field_14_dttmCreated            = LittleEndian.getInt(data, 0x14 + offset);
-        field_15_dttmRevised            = LittleEndian.getInt(data, 0x18 + offset);
-        field_16_dttmLastPrint          = LittleEndian.getInt(data, 0x1c + offset);
-        field_17_nRevision              = LittleEndian.getShort(data, 0x20 + offset);
-        field_18_tmEdited               = LittleEndian.getInt(data, 0x22 + offset);
-        field_19_cWords                 = LittleEndian.getInt(data, 0x26 + offset);
-        field_20_cCh                    = LittleEndian.getInt(data, 0x2a + offset);
-        field_21_cPg                    = LittleEndian.getShort(data, 0x2e + offset);
-        field_22_cParas                 = LittleEndian.getInt(data, 0x30 + offset);
-        field_23_Edn                    = LittleEndian.getShort(data, 0x34 + offset);
-        field_24_Edn1                   = LittleEndian.getShort(data, 0x36 + offset);
-        field_25_cLines                 = LittleEndian.getInt(data, 0x38 + offset);
-        field_26_cWordsFtnEnd           = LittleEndian.getInt(data, 0x3c + offset);
-        field_27_cChFtnEdn              = LittleEndian.getInt(data, 0x40 + offset);
-        field_28_cPgFtnEdn              = LittleEndian.getShort(data, 0x44 + offset);
-        field_29_cParasFtnEdn           = LittleEndian.getInt(data, 0x46 + offset);
-        field_30_cLinesFtnEdn           = LittleEndian.getInt(data, 0x4a + offset);
-        field_31_lKeyProtDoc            = LittleEndian.getInt(data, 0x4e + offset);
-        field_32_view                   = LittleEndian.getShort(data, 0x52 + offset);
-        field_33_docinfo4               = LittleEndian.getInt(data, 0x54 + offset);
-        field_34_adt                    = LittleEndian.getShort(data, 0x58 + offset);
-        field_35_doptypography          = LittleEndian.getByteArray(data, 0x5a + offset,310);
-        field_36_dogrid                 = LittleEndian.getByteArray(data, 0x190 + offset,10);
-        field_37_docinfo5               = LittleEndian.getShort(data, 0x19a + offset);
-        field_38_docinfo6               = LittleEndian.getShort(data, 0x19c + offset);
-        field_39_asumyi                 = LittleEndian.getByteArray(data, 0x19e + offset,12);
-        field_40_cChWS                  = LittleEndian.getInt(data, 0x1aa + offset);
-        field_41_cChWSFtnEdn            = LittleEndian.getInt(data, 0x1ae + offset);
-        field_42_grfDocEvents           = LittleEndian.getInt(data, 0x1b2 + offset);
-        field_43_virusinfo              = LittleEndian.getInt(data, 0x1b6 + offset);
-        field_44_Spare                  = LittleEndian.getByteArray(data, 0x1ba + offset,30);
-        field_45_reserved1              = LittleEndian.getInt(data, 0x1d8 + offset);
-        field_46_reserved2              = LittleEndian.getInt(data, 0x1dc + offset);
-        field_47_cDBC                   = LittleEndian.getInt(data, 0x1e0 + offset);
-        field_48_cDBCFtnEdn             = LittleEndian.getInt(data, 0x1e4 + offset);
-        field_49_reserved               = LittleEndian.getInt(data, 0x1e8 + offset);
-        field_50_nfcFtnRef              = LittleEndian.getShort(data, 0x1ec + offset);
-        field_51_nfcEdnRef              = LittleEndian.getShort(data, 0x1ee + offset);
-        field_52_hpsZoonFontPag         = LittleEndian.getShort(data, 0x1f0 + offset);
-        field_53_dywDispPag             = LittleEndian.getShort(data, 0x1f2 + offset);
-    }
-
-    public void serialize(byte[] data, int offset)
-    {
-        data[ 0x0 + offset] = field_1_formatFlags;
-        data[ 0x1 + offset] = field_2_unused2;
-        LittleEndian.putShort(data, 0x2 + offset, field_3_footnoteInfo);
-        data[ 0x4 + offset] = field_4_fOutlineDirtySave;
-        data[ 0x5 + offset] = field_5_docinfo;
-        data[ 0x6 + offset] = field_6_docinfo1;
-        data[ 0x7 + offset] = field_7_docinfo2;
-        LittleEndian.putShort(data, 0x8 + offset, field_8_docinfo3);
-        LittleEndian.putShort(data, 0xa + offset, (short)field_9_dxaTab);
-        LittleEndian.putShort(data, 0xc + offset, (short)field_10_wSpare);
-        LittleEndian.putShort(data, 0xe + offset, (short)field_11_dxaHotz);
-        LittleEndian.putShort(data, 0x10 + offset, (short)field_12_cConsexHypLim);
-        LittleEndian.putShort(data, 0x12 + offset, (short)field_13_wSpare2);
-        LittleEndian.putInt(data, 0x14 + offset, field_14_dttmCreated);
-        LittleEndian.putInt(data, 0x18 + offset, field_15_dttmRevised);
-        LittleEndian.putInt(data, 0x1c + offset, field_16_dttmLastPrint);
-        LittleEndian.putShort(data, 0x20 + offset, (short)field_17_nRevision);
-        LittleEndian.putInt(data, 0x22 + offset, field_18_tmEdited);
-        LittleEndian.putInt(data, 0x26 + offset, field_19_cWords);
-        LittleEndian.putInt(data, 0x2a + offset, field_20_cCh);
-        LittleEndian.putShort(data, 0x2e + offset, (short)field_21_cPg);
-        LittleEndian.putInt(data, 0x30 + offset, field_22_cParas);
-        LittleEndian.putShort(data, 0x34 + offset, field_23_Edn);
-        LittleEndian.putShort(data, 0x36 + offset, field_24_Edn1);
-        LittleEndian.putInt(data, 0x38 + offset, field_25_cLines);
-        LittleEndian.putInt(data, 0x3c + offset, field_26_cWordsFtnEnd);
-        LittleEndian.putInt(data, 0x40 + offset, field_27_cChFtnEdn);
-        LittleEndian.putShort(data, 0x44 + offset, field_28_cPgFtnEdn);
-        LittleEndian.putInt(data, 0x46 + offset, field_29_cParasFtnEdn);
-        LittleEndian.putInt(data, 0x4a + offset, field_30_cLinesFtnEdn);
-        LittleEndian.putInt(data, 0x4e + offset, field_31_lKeyProtDoc);
-        LittleEndian.putShort(data, 0x52 + offset, field_32_view);
-        LittleEndian.putInt(data, 0x54 + offset, field_33_docinfo4);
-        LittleEndian.putShort(data, 0x58 + offset, field_34_adt);
-        ;
-        ;
-        LittleEndian.putShort(data, 0x19a + offset, field_37_docinfo5);
-        LittleEndian.putShort(data, 0x19c + offset, field_38_docinfo6);
-        ;
-        LittleEndian.putInt(data, 0x1aa + offset, field_40_cChWS);
-        LittleEndian.putInt(data, 0x1ae + offset, field_41_cChWSFtnEdn);
-        LittleEndian.putInt(data, 0x1b2 + offset, field_42_grfDocEvents);
-        LittleEndian.putInt(data, 0x1b6 + offset, field_43_virusinfo);
-        ;
-        LittleEndian.putInt(data, 0x1d8 + offset, field_45_reserved1);
-        LittleEndian.putInt(data, 0x1dc + offset, field_46_reserved2);
-        LittleEndian.putInt(data, 0x1e0 + offset, field_47_cDBC);
-        LittleEndian.putInt(data, 0x1e4 + offset, field_48_cDBCFtnEdn);
-        LittleEndian.putInt(data, 0x1e8 + offset, field_49_reserved);
-        LittleEndian.putShort(data, 0x1ec + offset, field_50_nfcFtnRef);
-        LittleEndian.putShort(data, 0x1ee + offset, field_51_nfcEdnRef);
-        LittleEndian.putShort(data, 0x1f0 + offset, field_52_hpsZoonFontPag);
-        LittleEndian.putShort(data, 0x1f2 + offset, field_53_dywDispPag);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DOP]\n");
-
-        buffer.append("    .formatFlags          = ");
-        buffer.append(HexDump.byteToHex(getFormatFlags()));
-        buffer.append(" (").append(getFormatFlags()).append(" )\n");
-        buffer.append("         .fFacingPages             = ").append(isFFacingPages()).append('\n');
-        buffer.append("         .fWidowControl            = ").append(isFWidowControl()).append('\n');
-        buffer.append("         .fPMHMainDoc              = ").append(isFPMHMainDoc()).append('\n');
-        buffer.append("         .grfSupression            = ").append(getGrfSupression()).append('\n');
-        buffer.append("         .fpc                      = ").append(getFpc()).append('\n');
-        buffer.append("         .unused1                  = ").append(isUnused1()).append('\n');
-
-        buffer.append("    .unused2              = ");
-        buffer.append(HexDump.byteToHex(getUnused2()));
-        buffer.append(" (").append(getUnused2()).append(" )\n");
-
-        buffer.append("    .footnoteInfo         = ");
-        buffer.append(HexDump.shortToHex(getFootnoteInfo()));
-        buffer.append(" (").append(getFootnoteInfo()).append(" )\n");
-        buffer.append("         .rncFtn                   = ").append(getRncFtn()).append('\n');
-        buffer.append("         .nFtn                     = ").append(getNFtn()).append('\n');
-
-        buffer.append("    .fOutlineDirtySave    = ");
-        buffer.append(HexDump.byteToHex(getFOutlineDirtySave()));
-        buffer.append(" (").append(getFOutlineDirtySave()).append(" )\n");
-
-        buffer.append("    .docinfo              = ");
-        buffer.append(HexDump.byteToHex(getDocinfo()));
-        buffer.append(" (").append(getDocinfo()).append(" )\n");
-        buffer.append("         .fOnlyMacPics             = ").append(isFOnlyMacPics()).append('\n');
-        buffer.append("         .fOnlyWinPics             = ").append(isFOnlyWinPics()).append('\n');
-        buffer.append("         .fLabelDoc                = ").append(isFLabelDoc()).append('\n');
-        buffer.append("         .fHyphCapitals            = ").append(isFHyphCapitals()).append('\n');
-        buffer.append("         .fAutoHyphen              = ").append(isFAutoHyphen()).append('\n');
-        buffer.append("         .fFormNoFields            = ").append(isFFormNoFields()).append('\n');
-        buffer.append("         .fLinkStyles              = ").append(isFLinkStyles()).append('\n');
-        buffer.append("         .fRevMarking              = ").append(isFRevMarking()).append('\n');
-
-        buffer.append("    .docinfo1             = ");
-        buffer.append(HexDump.byteToHex(getDocinfo1()));
-        buffer.append(" (").append(getDocinfo1()).append(" )\n");
-        buffer.append("         .fBackup                  = ").append(isFBackup()).append('\n');
-        buffer.append("         .fExactCWords             = ").append(isFExactCWords()).append('\n');
-        buffer.append("         .fPagHidden               = ").append(isFPagHidden()).append('\n');
-        buffer.append("         .fPagResults              = ").append(isFPagResults()).append('\n');
-        buffer.append("         .fLockAtn                 = ").append(isFLockAtn()).append('\n');
-        buffer.append("         .fMirrorMargins           = ").append(isFMirrorMargins()).append('\n');
-        buffer.append("         .unused3                  = ").append(isUnused3()).append('\n');
-        buffer.append("         .fDfltTrueType            = ").append(isFDfltTrueType()).append('\n');
-
-        buffer.append("    .docinfo2             = ");
-        buffer.append(HexDump.byteToHex(getDocinfo2()));
-        buffer.append(" (").append(getDocinfo2()).append(" )\n");
-        buffer.append("         .fPagSupressTopSpacing     = ").append(isFPagSupressTopSpacing()).append('\n');
-        buffer.append("         .fProtEnabled             = ").append(isFProtEnabled()).append('\n');
-        buffer.append("         .fDispFormFldSel          = ").append(isFDispFormFldSel()).append('\n');
-        buffer.append("         .fRMView                  = ").append(isFRMView()).append('\n');
-        buffer.append("         .fRMPrint                 = ").append(isFRMPrint()).append('\n');
-        buffer.append("         .unused4                  = ").append(isUnused4()).append('\n');
-        buffer.append("         .fLockRev                 = ").append(isFLockRev()).append('\n');
-        buffer.append("         .fEmbedFonts              = ").append(isFEmbedFonts()).append('\n');
-
-        buffer.append("    .docinfo3             = ");
-        buffer.append(HexDump.shortToHex(getDocinfo3()));
-        buffer.append(" (").append(getDocinfo3()).append(" )\n");
-        buffer.append("         .oldfNoTabForInd          = ").append(isOldfNoTabForInd()).append('\n');
-        buffer.append("         .oldfNoSpaceRaiseLower     = ").append(isOldfNoSpaceRaiseLower()).append('\n');
-        buffer.append("         .oldfSuppressSpbfAfterPageBreak     = ").append(isOldfSuppressSpbfAfterPageBreak()).append('\n');
-        buffer.append("         .oldfWrapTrailSpaces      = ").append(isOldfWrapTrailSpaces()).append('\n');
-        buffer.append("         .oldfMapPrintTextColor     = ").append(isOldfMapPrintTextColor()).append('\n');
-        buffer.append("         .oldfNoColumnBalance      = ").append(isOldfNoColumnBalance()).append('\n');
-        buffer.append("         .oldfConvMailMergeEsc     = ").append(isOldfConvMailMergeEsc()).append('\n');
-        buffer.append("         .oldfSupressTopSpacing     = ").append(isOldfSupressTopSpacing()).append('\n');
-        buffer.append("         .oldfOrigWordTableRules     = ").append(isOldfOrigWordTableRules()).append('\n');
-        buffer.append("         .oldfTransparentMetafiles     = ").append(isOldfTransparentMetafiles()).append('\n');
-        buffer.append("         .oldfShowBreaksInFrames     = ").append(isOldfShowBreaksInFrames()).append('\n');
-        buffer.append("         .oldfSwapBordersFacingPgs     = ").append(isOldfSwapBordersFacingPgs()).append('\n');
-        buffer.append("         .unused5                  = ").append(getUnused5()).append('\n');
-
-        buffer.append("    .dxaTab               = ");
-        buffer.append(HexDump.intToHex(getDxaTab()));
-        buffer.append(" (").append(getDxaTab()).append(" )\n");
-
-        buffer.append("    .wSpare               = ");
-        buffer.append(HexDump.intToHex(getWSpare()));
-        buffer.append(" (").append(getWSpare()).append(" )\n");
-
-        buffer.append("    .dxaHotz              = ");
-        buffer.append(HexDump.intToHex(getDxaHotz()));
-        buffer.append(" (").append(getDxaHotz()).append(" )\n");
-
-        buffer.append("    .cConsexHypLim        = ");
-        buffer.append(HexDump.intToHex(getCConsexHypLim()));
-        buffer.append(" (").append(getCConsexHypLim()).append(" )\n");
-
-        buffer.append("    .wSpare2              = ");
-        buffer.append(HexDump.intToHex(getWSpare2()));
-        buffer.append(" (").append(getWSpare2()).append(" )\n");
-
-        buffer.append("    .dttmCreated          = ");
-        buffer.append(HexDump.intToHex(getDttmCreated()));
-        buffer.append(" (").append(getDttmCreated()).append(" )\n");
-
-        buffer.append("    .dttmRevised          = ");
-        buffer.append(HexDump.intToHex(getDttmRevised()));
-        buffer.append(" (").append(getDttmRevised()).append(" )\n");
-
-        buffer.append("    .dttmLastPrint        = ");
-        buffer.append(HexDump.intToHex(getDttmLastPrint()));
-        buffer.append(" (").append(getDttmLastPrint()).append(" )\n");
-
-        buffer.append("    .nRevision            = ");
-        buffer.append(HexDump.intToHex(getNRevision()));
-        buffer.append(" (").append(getNRevision()).append(" )\n");
-
-        buffer.append("    .tmEdited             = ");
-        buffer.append(HexDump.intToHex(getTmEdited()));
-        buffer.append(" (").append(getTmEdited()).append(" )\n");
-
-        buffer.append("    .cWords               = ");
-        buffer.append(HexDump.intToHex(getCWords()));
-        buffer.append(" (").append(getCWords()).append(" )\n");
-
-        buffer.append("    .cCh                  = ");
-        buffer.append(HexDump.intToHex(getCCh()));
-        buffer.append(" (").append(getCCh()).append(" )\n");
-
-        buffer.append("    .cPg                  = ");
-        buffer.append(HexDump.intToHex(getCPg()));
-        buffer.append(" (").append(getCPg()).append(" )\n");
-
-        buffer.append("    .cParas               = ");
-        buffer.append(HexDump.intToHex(getCParas()));
-        buffer.append(" (").append(getCParas()).append(" )\n");
-
-        buffer.append("    .Edn                  = ");
-        buffer.append(HexDump.shortToHex(getEdn()));
-        buffer.append(" (").append(getEdn()).append(" )\n");
-        buffer.append("         .rncEdn                   = ").append(getRncEdn()).append('\n');
-        buffer.append("         .nEdn                     = ").append(getNEdn()).append('\n');
-
-        buffer.append("    .Edn1                 = ");
-        buffer.append(HexDump.shortToHex(getEdn1()));
-        buffer.append(" (").append(getEdn1()).append(" )\n");
-        buffer.append("         .epc                      = ").append(getEpc()).append('\n');
-        buffer.append("         .nfcFtnRef1               = ").append(getNfcFtnRef1()).append('\n');
-        buffer.append("         .nfcEdnRef1               = ").append(getNfcEdnRef1()).append('\n');
-        buffer.append("         .fPrintFormData           = ").append(isFPrintFormData()).append('\n');
-        buffer.append("         .fSaveFormData            = ").append(isFSaveFormData()).append('\n');
-        buffer.append("         .fShadeFormData           = ").append(isFShadeFormData()).append('\n');
-        buffer.append("         .fWCFtnEdn                = ").append(isFWCFtnEdn()).append('\n');
-
-        buffer.append("    .cLines               = ");
-        buffer.append(HexDump.intToHex(getCLines()));
-        buffer.append(" (").append(getCLines()).append(" )\n");
-
-        buffer.append("    .cWordsFtnEnd         = ");
-        buffer.append(HexDump.intToHex(getCWordsFtnEnd()));
-        buffer.append(" (").append(getCWordsFtnEnd()).append(" )\n");
-
-        buffer.append("    .cChFtnEdn            = ");
-        buffer.append(HexDump.intToHex(getCChFtnEdn()));
-        buffer.append(" (").append(getCChFtnEdn()).append(" )\n");
-
-        buffer.append("    .cPgFtnEdn            = ");
-        buffer.append(HexDump.shortToHex(getCPgFtnEdn()));
-        buffer.append(" (").append(getCPgFtnEdn()).append(" )\n");
-
-        buffer.append("    .cParasFtnEdn         = ");
-        buffer.append(HexDump.intToHex(getCParasFtnEdn()));
-        buffer.append(" (").append(getCParasFtnEdn()).append(" )\n");
-
-        buffer.append("    .cLinesFtnEdn         = ");
-        buffer.append(HexDump.intToHex(getCLinesFtnEdn()));
-        buffer.append(" (").append(getCLinesFtnEdn()).append(" )\n");
-
-        buffer.append("    .lKeyProtDoc          = ");
-        buffer.append(HexDump.intToHex(getLKeyProtDoc()));
-        buffer.append(" (").append(getLKeyProtDoc()).append(" )\n");
-
-        buffer.append("    .view                 = ");
-        buffer.append(HexDump.shortToHex(getView()));
-        buffer.append(" (").append(getView()).append(" )\n");
-        buffer.append("         .wvkSaved                 = ").append(getWvkSaved()).append('\n');
-        buffer.append("         .wScaleSaved              = ").append(getWScaleSaved()).append('\n');
-        buffer.append("         .zkSaved                  = ").append(getZkSaved()).append('\n');
-        buffer.append("         .fRotateFontW6            = ").append(isFRotateFontW6()).append('\n');
-        buffer.append("         .iGutterPos               = ").append(isIGutterPos()).append('\n');
-
-        buffer.append("    .docinfo4             = ");
-        buffer.append(HexDump.intToHex(getDocinfo4()));
-        buffer.append(" (").append(getDocinfo4()).append(" )\n");
-        buffer.append("         .fNoTabForInd             = ").append(isFNoTabForInd()).append('\n');
-        buffer.append("         .fNoSpaceRaiseLower       = ").append(isFNoSpaceRaiseLower()).append('\n');
-        buffer.append("         .fSupressSpdfAfterPageBreak     = ").append(isFSupressSpdfAfterPageBreak()).append('\n');
-        buffer.append("         .fWrapTrailSpaces         = ").append(isFWrapTrailSpaces()).append('\n');
-        buffer.append("         .fMapPrintTextColor       = ").append(isFMapPrintTextColor()).append('\n');
-        buffer.append("         .fNoColumnBalance         = ").append(isFNoColumnBalance()).append('\n');
-        buffer.append("         .fConvMailMergeEsc        = ").append(isFConvMailMergeEsc()).append('\n');
-        buffer.append("         .fSupressTopSpacing       = ").append(isFSupressTopSpacing()).append('\n');
-        buffer.append("         .fOrigWordTableRules      = ").append(isFOrigWordTableRules()).append('\n');
-        buffer.append("         .fTransparentMetafiles     = ").append(isFTransparentMetafiles()).append('\n');
-        buffer.append("         .fShowBreaksInFrames      = ").append(isFShowBreaksInFrames()).append('\n');
-        buffer.append("         .fSwapBordersFacingPgs     = ").append(isFSwapBordersFacingPgs()).append('\n');
-        buffer.append("         .fSuppressTopSPacingMac5     = ").append(isFSuppressTopSPacingMac5()).append('\n');
-        buffer.append("         .fTruncDxaExpand          = ").append(isFTruncDxaExpand()).append('\n');
-        buffer.append("         .fPrintBodyBeforeHdr      = ").append(isFPrintBodyBeforeHdr()).append('\n');
-        buffer.append("         .fNoLeading               = ").append(isFNoLeading()).append('\n');
-        buffer.append("         .fMWSmallCaps             = ").append(isFMWSmallCaps()).append('\n');
-
-        buffer.append("    .adt                  = ");
-        buffer.append(HexDump.shortToHex(getAdt()));
-        buffer.append(" (").append(getAdt()).append(" )\n");
-
-        buffer.append("    .doptypography        = ");
-        buffer.append(HexDump.toHex(getDoptypography()));
-        buffer.append(" (").append(Arrays.toString(getDoptypography())).append(" )\n");
-
-        buffer.append("    .dogrid               = ");
-        buffer.append(HexDump.toHex(getDogrid()));
-        buffer.append(" (").append(Arrays.toString(getDogrid())).append(" )\n");
-
-        buffer.append("    .docinfo5             = ");
-        buffer.append(HexDump.shortToHex(getDocinfo5()));
-        buffer.append(" (").append(getDocinfo5()).append(" )\n");
-        buffer.append("         .lvl                      = ").append(getLvl()).append('\n');
-        buffer.append("         .fGramAllDone             = ").append(isFGramAllDone()).append('\n');
-        buffer.append("         .fGramAllClean            = ").append(isFGramAllClean()).append('\n');
-        buffer.append("         .fSubsetFonts             = ").append(isFSubsetFonts()).append('\n');
-        buffer.append("         .fHideLastVersion         = ").append(isFHideLastVersion()).append('\n');
-        buffer.append("         .fHtmlDoc                 = ").append(isFHtmlDoc()).append('\n');
-        buffer.append("         .fSnapBorder              = ").append(isFSnapBorder()).append('\n');
-        buffer.append("         .fIncludeHeader           = ").append(isFIncludeHeader()).append('\n');
-        buffer.append("         .fIncludeFooter           = ").append(isFIncludeFooter()).append('\n');
-        buffer.append("         .fForcePageSizePag        = ").append(isFForcePageSizePag()).append('\n');
-        buffer.append("         .fMinFontSizePag          = ").append(isFMinFontSizePag()).append('\n');
-
-        buffer.append("    .docinfo6             = ");
-        buffer.append(HexDump.shortToHex(getDocinfo6()));
-        buffer.append(" (").append(getDocinfo6()).append(" )\n");
-        buffer.append("         .fHaveVersions            = ").append(isFHaveVersions()).append('\n');
-        buffer.append("         .fAutoVersions            = ").append(isFAutoVersions()).append('\n');
-
-        buffer.append("    .asumyi               = ");
-        buffer.append(HexDump.toHex(getAsumyi()));
-        buffer.append(" (").append(Arrays.toString(getAsumyi())).append(" )\n");
-
-        buffer.append("    .cChWS                = ");
-        buffer.append(HexDump.intToHex(getCChWS()));
-        buffer.append(" (").append(getCChWS()).append(" )\n");
-
-        buffer.append("    .cChWSFtnEdn          = ");
-        buffer.append(HexDump.intToHex(getCChWSFtnEdn()));
-        buffer.append(" (").append(getCChWSFtnEdn()).append(" )\n");
-
-        buffer.append("    .grfDocEvents         = ");
-        buffer.append(HexDump.intToHex(getGrfDocEvents()));
-        buffer.append(" (").append(getGrfDocEvents()).append(" )\n");
-
-        buffer.append("    .virusinfo            = ");
-        buffer.append(HexDump.intToHex(getVirusinfo()));
-        buffer.append(" (").append(getVirusinfo()).append(" )\n");
-        buffer.append("         .fVirusPrompted           = ").append(isFVirusPrompted()).append('\n');
-        buffer.append("         .fVirusLoadSafe           = ").append(isFVirusLoadSafe()).append('\n');
-        buffer.append("         .KeyVirusSession30        = ").append(getKeyVirusSession30()).append('\n');
-
-        buffer.append("    .Spare                = ");
-        buffer.append(HexDump.toHex(getSpare()));
-        buffer.append(" (").append(Arrays.toString(getSpare())).append(" )\n");
-
-        buffer.append("    .reserved1            = ");
-        buffer.append(HexDump.intToHex(getReserved1()));
-        buffer.append(" (").append(getReserved1()).append(" )\n");
-
-        buffer.append("    .reserved2            = ");
-        buffer.append(HexDump.intToHex(getReserved2()));
-        buffer.append(" (").append(getReserved2()).append(" )\n");
-
-        buffer.append("    .cDBC                 = ");
-        buffer.append(HexDump.intToHex(getCDBC()));
-        buffer.append(" (").append(getCDBC()).append(" )\n");
-
-        buffer.append("    .cDBCFtnEdn           = ");
-        buffer.append(HexDump.intToHex(getCDBCFtnEdn()));
-        buffer.append(" (").append(getCDBCFtnEdn()).append(" )\n");
-
-        buffer.append("    .reserved             = ");
-        buffer.append(HexDump.intToHex(getReserved()));
-        buffer.append(" (").append(getReserved()).append(" )\n");
-
-        buffer.append("    .nfcFtnRef            = ");
-        buffer.append(HexDump.shortToHex(getNfcFtnRef()));
-        buffer.append(" (").append(getNfcFtnRef()).append(" )\n");
-
-        buffer.append("    .nfcEdnRef            = ");
-        buffer.append(HexDump.shortToHex(getNfcEdnRef()));
-        buffer.append(" (").append(getNfcEdnRef()).append(" )\n");
-
-        buffer.append("    .hpsZoonFontPag       = ");
-        buffer.append(HexDump.shortToHex(getHpsZoonFontPag()));
-        buffer.append(" (").append(getHpsZoonFontPag()).append(" )\n");
-
-        buffer.append("    .dywDispPag           = ");
-        buffer.append(HexDump.shortToHex(getDywDispPag()));
-        buffer.append(" (").append(getDywDispPag()).append(" )\n");
-
-        buffer.append("[/DOP]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 1 + 1 + 2 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 4 + 2 + 4 + 4 + 4 + 2 + 4 + 2 + 2 + 4 + 4 + 4 + 2 + 4 + 4 + 4 + 2 + 4 + 2 + 310 + 10 + 2 + 2 + 12 + 4 + 4 + 4 + 4 + 30 + 4 + 4 + 4 + 4 + 4 + 2 + 2 + 2 + 2;
-    }
-
-
-
-    /**
-     * Get the formatFlags field for the DOP record.
-     */
-    public byte getFormatFlags()
-    {
-        return field_1_formatFlags;
-    }
-
-    /**
-     * Set the formatFlags field for the DOP record.
-     */
-    public void setFormatFlags(byte field_1_formatFlags)
-    {
-        this.field_1_formatFlags = field_1_formatFlags;
-    }
-
-    /**
-     * Get the unused2 field for the DOP record.
-     */
-    public byte getUnused2()
-    {
-        return field_2_unused2;
-    }
-
-    /**
-     * Set the unused2 field for the DOP record.
-     */
-    public void setUnused2(byte field_2_unused2)
-    {
-        this.field_2_unused2 = field_2_unused2;
-    }
-
-    /**
-     * Get the footnoteInfo field for the DOP record.
-     */
-    public short getFootnoteInfo()
-    {
-        return field_3_footnoteInfo;
-    }
-
-    /**
-     * Set the footnoteInfo field for the DOP record.
-     */
-    public void setFootnoteInfo(short field_3_footnoteInfo)
-    {
-        this.field_3_footnoteInfo = field_3_footnoteInfo;
-    }
-
-    /**
-     * Get the fOutlineDirtySave field for the DOP record.
-     */
-    public byte getFOutlineDirtySave()
-    {
-        return field_4_fOutlineDirtySave;
-    }
-
-    /**
-     * Set the fOutlineDirtySave field for the DOP record.
-     */
-    public void setFOutlineDirtySave(byte field_4_fOutlineDirtySave)
-    {
-        this.field_4_fOutlineDirtySave = field_4_fOutlineDirtySave;
-    }
-
-    /**
-     * Get the docinfo field for the DOP record.
-     */
-    public byte getDocinfo()
-    {
-        return field_5_docinfo;
-    }
-
-    /**
-     * Set the docinfo field for the DOP record.
-     */
-    public void setDocinfo(byte field_5_docinfo)
-    {
-        this.field_5_docinfo = field_5_docinfo;
-    }
-
-    /**
-     * Get the docinfo1 field for the DOP record.
-     */
-    public byte getDocinfo1()
-    {
-        return field_6_docinfo1;
-    }
-
-    /**
-     * Set the docinfo1 field for the DOP record.
-     */
-    public void setDocinfo1(byte field_6_docinfo1)
-    {
-        this.field_6_docinfo1 = field_6_docinfo1;
-    }
-
-    /**
-     * Get the docinfo2 field for the DOP record.
-     */
-    public byte getDocinfo2()
-    {
-        return field_7_docinfo2;
-    }
-
-    /**
-     * Set the docinfo2 field for the DOP record.
-     */
-    public void setDocinfo2(byte field_7_docinfo2)
-    {
-        this.field_7_docinfo2 = field_7_docinfo2;
-    }
-
-    /**
-     * Get the docinfo3 field for the DOP record.
-     */
-    public short getDocinfo3()
-    {
-        return field_8_docinfo3;
-    }
-
-    /**
-     * Set the docinfo3 field for the DOP record.
-     */
-    public void setDocinfo3(short field_8_docinfo3)
-    {
-        this.field_8_docinfo3 = field_8_docinfo3;
-    }
-
-    /**
-     * Get the dxaTab field for the DOP record.
-     */
-    public int getDxaTab()
-    {
-        return field_9_dxaTab;
-    }
-
-    /**
-     * Set the dxaTab field for the DOP record.
-     */
-    public void setDxaTab(int field_9_dxaTab)
-    {
-        this.field_9_dxaTab = field_9_dxaTab;
-    }
-
-    /**
-     * Get the wSpare field for the DOP record.
-     */
-    public int getWSpare()
-    {
-        return field_10_wSpare;
-    }
-
-    /**
-     * Set the wSpare field for the DOP record.
-     */
-    public void setWSpare(int field_10_wSpare)
-    {
-        this.field_10_wSpare = field_10_wSpare;
-    }
-
-    /**
-     * Get the dxaHotz field for the DOP record.
-     */
-    public int getDxaHotz()
-    {
-        return field_11_dxaHotz;
-    }
-
-    /**
-     * Set the dxaHotz field for the DOP record.
-     */
-    public void setDxaHotz(int field_11_dxaHotz)
-    {
-        this.field_11_dxaHotz = field_11_dxaHotz;
-    }
-
-    /**
-     * Get the cConsexHypLim field for the DOP record.
-     */
-    public int getCConsexHypLim()
-    {
-        return field_12_cConsexHypLim;
-    }
-
-    /**
-     * Set the cConsexHypLim field for the DOP record.
-     */
-    public void setCConsexHypLim(int field_12_cConsexHypLim)
-    {
-        this.field_12_cConsexHypLim = field_12_cConsexHypLim;
-    }
-
-    /**
-     * Get the wSpare2 field for the DOP record.
-     */
-    public int getWSpare2()
-    {
-        return field_13_wSpare2;
-    }
-
-    /**
-     * Set the wSpare2 field for the DOP record.
-     */
-    public void setWSpare2(int field_13_wSpare2)
-    {
-        this.field_13_wSpare2 = field_13_wSpare2;
-    }
-
-    /**
-     * Get the dttmCreated field for the DOP record.
-     */
-    public int getDttmCreated()
-    {
-        return field_14_dttmCreated;
-    }
-
-    /**
-     * Set the dttmCreated field for the DOP record.
-     */
-    public void setDttmCreated(int field_14_dttmCreated)
-    {
-        this.field_14_dttmCreated = field_14_dttmCreated;
-    }
-
-    /**
-     * Get the dttmRevised field for the DOP record.
-     */
-    public int getDttmRevised()
-    {
-        return field_15_dttmRevised;
-    }
-
-    /**
-     * Set the dttmRevised field for the DOP record.
-     */
-    public void setDttmRevised(int field_15_dttmRevised)
-    {
-        this.field_15_dttmRevised = field_15_dttmRevised;
-    }
-
-    /**
-     * Get the dttmLastPrint field for the DOP record.
-     */
-    public int getDttmLastPrint()
-    {
-        return field_16_dttmLastPrint;
-    }
-
-    /**
-     * Set the dttmLastPrint field for the DOP record.
-     */
-    public void setDttmLastPrint(int field_16_dttmLastPrint)
-    {
-        this.field_16_dttmLastPrint = field_16_dttmLastPrint;
-    }
-
-    /**
-     * Get the nRevision field for the DOP record.
-     */
-    public int getNRevision()
-    {
-        return field_17_nRevision;
-    }
-
-    /**
-     * Set the nRevision field for the DOP record.
-     */
-    public void setNRevision(int field_17_nRevision)
-    {
-        this.field_17_nRevision = field_17_nRevision;
-    }
-
-    /**
-     * Get the tmEdited field for the DOP record.
-     */
-    public int getTmEdited()
-    {
-        return field_18_tmEdited;
-    }
-
-    /**
-     * Set the tmEdited field for the DOP record.
-     */
-    public void setTmEdited(int field_18_tmEdited)
-    {
-        this.field_18_tmEdited = field_18_tmEdited;
-    }
-
-    /**
-     * Get the cWords field for the DOP record.
-     */
-    public int getCWords()
-    {
-        return field_19_cWords;
-    }
-
-    /**
-     * Set the cWords field for the DOP record.
-     */
-    public void setCWords(int field_19_cWords)
-    {
-        this.field_19_cWords = field_19_cWords;
-    }
-
-    /**
-     * Get the cCh field for the DOP record.
-     */
-    public int getCCh()
-    {
-        return field_20_cCh;
-    }
-
-    /**
-     * Set the cCh field for the DOP record.
-     */
-    public void setCCh(int field_20_cCh)
-    {
-        this.field_20_cCh = field_20_cCh;
-    }
-
-    /**
-     * Get the cPg field for the DOP record.
-     */
-    public int getCPg()
-    {
-        return field_21_cPg;
-    }
-
-    /**
-     * Set the cPg field for the DOP record.
-     */
-    public void setCPg(int field_21_cPg)
-    {
-        this.field_21_cPg = field_21_cPg;
-    }
-
-    /**
-     * Get the cParas field for the DOP record.
-     */
-    public int getCParas()
-    {
-        return field_22_cParas;
-    }
-
-    /**
-     * Set the cParas field for the DOP record.
-     */
-    public void setCParas(int field_22_cParas)
-    {
-        this.field_22_cParas = field_22_cParas;
-    }
-
-    /**
-     * Get the Edn field for the DOP record.
-     */
-    public short getEdn()
-    {
-        return field_23_Edn;
-    }
-
-    /**
-     * Set the Edn field for the DOP record.
-     */
-    public void setEdn(short field_23_Edn)
-    {
-        this.field_23_Edn = field_23_Edn;
-    }
-
-    /**
-     * Get the Edn1 field for the DOP record.
-     */
-    public short getEdn1()
-    {
-        return field_24_Edn1;
-    }
-
-    /**
-     * Set the Edn1 field for the DOP record.
-     */
-    public void setEdn1(short field_24_Edn1)
-    {
-        this.field_24_Edn1 = field_24_Edn1;
-    }
-
-    /**
-     * Get the cLines field for the DOP record.
-     */
-    public int getCLines()
-    {
-        return field_25_cLines;
-    }
-
-    /**
-     * Set the cLines field for the DOP record.
-     */
-    public void setCLines(int field_25_cLines)
-    {
-        this.field_25_cLines = field_25_cLines;
-    }
-
-    /**
-     * Get the cWordsFtnEnd field for the DOP record.
-     */
-    public int getCWordsFtnEnd()
-    {
-        return field_26_cWordsFtnEnd;
-    }
-
-    /**
-     * Set the cWordsFtnEnd field for the DOP record.
-     */
-    public void setCWordsFtnEnd(int field_26_cWordsFtnEnd)
-    {
-        this.field_26_cWordsFtnEnd = field_26_cWordsFtnEnd;
-    }
-
-    /**
-     * Get the cChFtnEdn field for the DOP record.
-     */
-    public int getCChFtnEdn()
-    {
-        return field_27_cChFtnEdn;
-    }
-
-    /**
-     * Set the cChFtnEdn field for the DOP record.
-     */
-    public void setCChFtnEdn(int field_27_cChFtnEdn)
-    {
-        this.field_27_cChFtnEdn = field_27_cChFtnEdn;
-    }
-
-    /**
-     * Get the cPgFtnEdn field for the DOP record.
-     */
-    public short getCPgFtnEdn()
-    {
-        return field_28_cPgFtnEdn;
-    }
-
-    /**
-     * Set the cPgFtnEdn field for the DOP record.
-     */
-    public void setCPgFtnEdn(short field_28_cPgFtnEdn)
-    {
-        this.field_28_cPgFtnEdn = field_28_cPgFtnEdn;
-    }
-
-    /**
-     * Get the cParasFtnEdn field for the DOP record.
-     */
-    public int getCParasFtnEdn()
-    {
-        return field_29_cParasFtnEdn;
-    }
-
-    /**
-     * Set the cParasFtnEdn field for the DOP record.
-     */
-    public void setCParasFtnEdn(int field_29_cParasFtnEdn)
-    {
-        this.field_29_cParasFtnEdn = field_29_cParasFtnEdn;
-    }
-
-    /**
-     * Get the cLinesFtnEdn field for the DOP record.
-     */
-    public int getCLinesFtnEdn()
-    {
-        return field_30_cLinesFtnEdn;
-    }
-
-    /**
-     * Set the cLinesFtnEdn field for the DOP record.
-     */
-    public void setCLinesFtnEdn(int field_30_cLinesFtnEdn)
-    {
-        this.field_30_cLinesFtnEdn = field_30_cLinesFtnEdn;
-    }
-
-    /**
-     * Get the lKeyProtDoc field for the DOP record.
-     */
-    public int getLKeyProtDoc()
-    {
-        return field_31_lKeyProtDoc;
-    }
-
-    /**
-     * Set the lKeyProtDoc field for the DOP record.
-     */
-    public void setLKeyProtDoc(int field_31_lKeyProtDoc)
-    {
-        this.field_31_lKeyProtDoc = field_31_lKeyProtDoc;
-    }
-
-    /**
-     * Get the view field for the DOP record.
-     */
-    public short getView()
-    {
-        return field_32_view;
-    }
-
-    /**
-     * Set the view field for the DOP record.
-     */
-    public void setView(short field_32_view)
-    {
-        this.field_32_view = field_32_view;
-    }
-
-    /**
-     * Get the docinfo4 field for the DOP record.
-     */
-    public int getDocinfo4()
-    {
-        return field_33_docinfo4;
-    }
-
-    /**
-     * Set the docinfo4 field for the DOP record.
-     */
-    public void setDocinfo4(int field_33_docinfo4)
-    {
-        this.field_33_docinfo4 = field_33_docinfo4;
-    }
-
-    /**
-     * Get the adt field for the DOP record.
-     */
-    public short getAdt()
-    {
-        return field_34_adt;
-    }
-
-    /**
-     * Set the adt field for the DOP record.
-     */
-    public void setAdt(short field_34_adt)
-    {
-        this.field_34_adt = field_34_adt;
-    }
-
-    /**
-     * Get the doptypography field for the DOP record.
-     */
-    public byte[] getDoptypography()
-    {
-        return field_35_doptypography;
-    }
-
-    /**
-     * Set the doptypography field for the DOP record.
-     */
-    public void setDoptypography(byte[] field_35_doptypography)
-    {
-        this.field_35_doptypography = field_35_doptypography;
-    }
-
-    /**
-     * Get the dogrid field for the DOP record.
-     */
-    public byte[] getDogrid()
-    {
-        return field_36_dogrid;
-    }
-
-    /**
-     * Set the dogrid field for the DOP record.
-     */
-    public void setDogrid(byte[] field_36_dogrid)
-    {
-        this.field_36_dogrid = field_36_dogrid;
-    }
-
-    /**
-     * Get the docinfo5 field for the DOP record.
-     */
-    public short getDocinfo5()
-    {
-        return field_37_docinfo5;
-    }
-
-    /**
-     * Set the docinfo5 field for the DOP record.
-     */
-    public void setDocinfo5(short field_37_docinfo5)
-    {
-        this.field_37_docinfo5 = field_37_docinfo5;
-    }
-
-    /**
-     * Get the docinfo6 field for the DOP record.
-     */
-    public short getDocinfo6()
-    {
-        return field_38_docinfo6;
-    }
-
-    /**
-     * Set the docinfo6 field for the DOP record.
-     */
-    public void setDocinfo6(short field_38_docinfo6)
-    {
-        this.field_38_docinfo6 = field_38_docinfo6;
-    }
-
-    /**
-     * Get the asumyi field for the DOP record.
-     */
-    public byte[] getAsumyi()
-    {
-        return field_39_asumyi;
-    }
-
-    /**
-     * Set the asumyi field for the DOP record.
-     */
-    public void setAsumyi(byte[] field_39_asumyi)
-    {
-        this.field_39_asumyi = field_39_asumyi;
-    }
-
-    /**
-     * Get the cChWS field for the DOP record.
-     */
-    public int getCChWS()
-    {
-        return field_40_cChWS;
-    }
-
-    /**
-     * Set the cChWS field for the DOP record.
-     */
-    public void setCChWS(int field_40_cChWS)
-    {
-        this.field_40_cChWS = field_40_cChWS;
-    }
-
-    /**
-     * Get the cChWSFtnEdn field for the DOP record.
-     */
-    public int getCChWSFtnEdn()
-    {
-        return field_41_cChWSFtnEdn;
-    }
-
-    /**
-     * Set the cChWSFtnEdn field for the DOP record.
-     */
-    public void setCChWSFtnEdn(int field_41_cChWSFtnEdn)
-    {
-        this.field_41_cChWSFtnEdn = field_41_cChWSFtnEdn;
-    }
-
-    /**
-     * Get the grfDocEvents field for the DOP record.
-     */
-    public int getGrfDocEvents()
-    {
-        return field_42_grfDocEvents;
-    }
-
-    /**
-     * Set the grfDocEvents field for the DOP record.
-     */
-    public void setGrfDocEvents(int field_42_grfDocEvents)
-    {
-        this.field_42_grfDocEvents = field_42_grfDocEvents;
-    }
-
-    /**
-     * Get the virusinfo field for the DOP record.
-     */
-    public int getVirusinfo()
-    {
-        return field_43_virusinfo;
-    }
-
-    /**
-     * Set the virusinfo field for the DOP record.
-     */
-    public void setVirusinfo(int field_43_virusinfo)
-    {
-        this.field_43_virusinfo = field_43_virusinfo;
-    }
-
-    /**
-     * Get the Spare field for the DOP record.
-     */
-    public byte[] getSpare()
-    {
-        return field_44_Spare;
-    }
-
-    /**
-     * Set the Spare field for the DOP record.
-     */
-    public void setSpare(byte[] field_44_Spare)
-    {
-        this.field_44_Spare = field_44_Spare;
-    }
-
-    /**
-     * Get the reserved1 field for the DOP record.
-     */
-    public int getReserved1()
-    {
-        return field_45_reserved1;
-    }
-
-    /**
-     * Set the reserved1 field for the DOP record.
-     */
-    public void setReserved1(int field_45_reserved1)
-    {
-        this.field_45_reserved1 = field_45_reserved1;
-    }
-
-    /**
-     * Get the reserved2 field for the DOP record.
-     */
-    public int getReserved2()
-    {
-        return field_46_reserved2;
-    }
-
-    /**
-     * Set the reserved2 field for the DOP record.
-     */
-    public void setReserved2(int field_46_reserved2)
-    {
-        this.field_46_reserved2 = field_46_reserved2;
-    }
-
-    /**
-     * Get the cDBC field for the DOP record.
-     */
-    public int getCDBC()
-    {
-        return field_47_cDBC;
-    }
-
-    /**
-     * Set the cDBC field for the DOP record.
-     */
-    public void setCDBC(int field_47_cDBC)
-    {
-        this.field_47_cDBC = field_47_cDBC;
-    }
-
-    /**
-     * Get the cDBCFtnEdn field for the DOP record.
-     */
-    public int getCDBCFtnEdn()
-    {
-        return field_48_cDBCFtnEdn;
-    }
-
-    /**
-     * Set the cDBCFtnEdn field for the DOP record.
-     */
-    public void setCDBCFtnEdn(int field_48_cDBCFtnEdn)
-    {
-        this.field_48_cDBCFtnEdn = field_48_cDBCFtnEdn;
-    }
-
-    /**
-     * Get the reserved field for the DOP record.
-     */
-    public int getReserved()
-    {
-        return field_49_reserved;
-    }
-
-    /**
-     * Set the reserved field for the DOP record.
-     */
-    public void setReserved(int field_49_reserved)
-    {
-        this.field_49_reserved = field_49_reserved;
-    }
-
-    /**
-     * Get the nfcFtnRef field for the DOP record.
-     */
-    public short getNfcFtnRef()
-    {
-        return field_50_nfcFtnRef;
-    }
-
-    /**
-     * Set the nfcFtnRef field for the DOP record.
-     */
-    public void setNfcFtnRef(short field_50_nfcFtnRef)
-    {
-        this.field_50_nfcFtnRef = field_50_nfcFtnRef;
-    }
-
-    /**
-     * Get the nfcEdnRef field for the DOP record.
-     */
-    public short getNfcEdnRef()
-    {
-        return field_51_nfcEdnRef;
-    }
-
-    /**
-     * Set the nfcEdnRef field for the DOP record.
-     */
-    public void setNfcEdnRef(short field_51_nfcEdnRef)
-    {
-        this.field_51_nfcEdnRef = field_51_nfcEdnRef;
-    }
-
-    /**
-     * Get the hpsZoonFontPag field for the DOP record.
-     */
-    public short getHpsZoonFontPag()
-    {
-        return field_52_hpsZoonFontPag;
-    }
-
-    /**
-     * Set the hpsZoonFontPag field for the DOP record.
-     */
-    public void setHpsZoonFontPag(short field_52_hpsZoonFontPag)
-    {
-        this.field_52_hpsZoonFontPag = field_52_hpsZoonFontPag;
-    }
-
-    /**
-     * Get the dywDispPag field for the DOP record.
-     */
-    public short getDywDispPag()
-    {
-        return field_53_dywDispPag;
-    }
-
-    /**
-     * Set the dywDispPag field for the DOP record.
-     */
-    public void setDywDispPag(short field_53_dywDispPag)
-    {
-        this.field_53_dywDispPag = field_53_dywDispPag;
-    }
-
-    /**
-     * Sets the fFacingPages field value.
-     *
-     */
-    public void setFFacingPages(boolean value)
-    {
-        field_1_formatFlags = (byte)fFacingPages.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the fFacingPages field value.
-     */
-    public boolean isFFacingPages()
-    {
-        return fFacingPages.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fWidowControl field value.
-     *
-     */
-    public void setFWidowControl(boolean value)
-    {
-        field_1_formatFlags = (byte)fWidowControl.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the fWidowControl field value.
-     */
-    public boolean isFWidowControl()
-    {
-        return fWidowControl.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fPMHMainDoc field value.
-     *
-     */
-    public void setFPMHMainDoc(boolean value)
-    {
-        field_1_formatFlags = (byte)fPMHMainDoc.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the fPMHMainDoc field value.
-     */
-    public boolean isFPMHMainDoc()
-    {
-        return fPMHMainDoc.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the grfSupression field value.
-     *
-     */
-    public void setGrfSupression(byte value)
-    {
-        field_1_formatFlags = (byte)grfSupression.setValue(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the grfSupression field value.
-     */
-    public byte getGrfSupression()
-    {
-        return ( byte )grfSupression.getValue(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fpc field value.
-     *
-     */
-    public void setFpc(byte value)
-    {
-        field_1_formatFlags = (byte)fpc.setValue(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the fpc field value.
-     */
-    public byte getFpc()
-    {
-        return ( byte )fpc.getValue(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the unused1 field value.
-     *
-     */
-    public void setUnused1(boolean value)
-    {
-        field_1_formatFlags = (byte)unused1.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     *
-     * @return  the unused1 field value.
-     */
-    public boolean isUnused1()
-    {
-        return unused1.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the rncFtn field value.
-     *
-     */
-    public void setRncFtn(byte value)
-    {
-        field_3_footnoteInfo = (short)rncFtn.setValue(field_3_footnoteInfo, value);
-    }
-
-    /**
-     *
-     * @return  the rncFtn field value.
-     */
-    public byte getRncFtn()
-    {
-        return ( byte )rncFtn.getValue(field_3_footnoteInfo);
-    }
-
-    /**
-     * Sets the nFtn field value.
-     *
-     */
-    public void setNFtn(short value)
-    {
-        field_3_footnoteInfo = (short)nFtn.setValue(field_3_footnoteInfo, value);
-    }
-
-    /**
-     *
-     * @return  the nFtn field value.
-     */
-    public short getNFtn()
-    {
-        return ( short )nFtn.getValue(field_3_footnoteInfo);
-    }
-
-    /**
-     * Sets the fOnlyMacPics field value.
-     *
-     */
-    public void setFOnlyMacPics(boolean value)
-    {
-        field_5_docinfo = (byte)fOnlyMacPics.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fOnlyMacPics field value.
-     */
-    public boolean isFOnlyMacPics()
-    {
-        return fOnlyMacPics.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fOnlyWinPics field value.
-     *
-     */
-    public void setFOnlyWinPics(boolean value)
-    {
-        field_5_docinfo = (byte)fOnlyWinPics.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fOnlyWinPics field value.
-     */
-    public boolean isFOnlyWinPics()
-    {
-        return fOnlyWinPics.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fLabelDoc field value.
-     *
-     */
-    public void setFLabelDoc(boolean value)
-    {
-        field_5_docinfo = (byte)fLabelDoc.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fLabelDoc field value.
-     */
-    public boolean isFLabelDoc()
-    {
-        return fLabelDoc.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fHyphCapitals field value.
-     *
-     */
-    public void setFHyphCapitals(boolean value)
-    {
-        field_5_docinfo = (byte)fHyphCapitals.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fHyphCapitals field value.
-     */
-    public boolean isFHyphCapitals()
-    {
-        return fHyphCapitals.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fAutoHyphen field value.
-     *
-     */
-    public void setFAutoHyphen(boolean value)
-    {
-        field_5_docinfo = (byte)fAutoHyphen.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fAutoHyphen field value.
-     */
-    public boolean isFAutoHyphen()
-    {
-        return fAutoHyphen.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fFormNoFields field value.
-     *
-     */
-    public void setFFormNoFields(boolean value)
-    {
-        field_5_docinfo = (byte)fFormNoFields.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fFormNoFields field value.
-     */
-    public boolean isFFormNoFields()
-    {
-        return fFormNoFields.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fLinkStyles field value.
-     *
-     */
-    public void setFLinkStyles(boolean value)
-    {
-        field_5_docinfo = (byte)fLinkStyles.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fLinkStyles field value.
-     */
-    public boolean isFLinkStyles()
-    {
-        return fLinkStyles.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fRevMarking field value.
-     *
-     */
-    public void setFRevMarking(boolean value)
-    {
-        field_5_docinfo = (byte)fRevMarking.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fRevMarking field value.
-     */
-    public boolean isFRevMarking()
-    {
-        return fRevMarking.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fBackup field value.
-     *
-     */
-    public void setFBackup(boolean value)
-    {
-        field_6_docinfo1 = (byte)fBackup.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fBackup field value.
-     */
-    public boolean isFBackup()
-    {
-        return fBackup.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fExactCWords field value.
-     *
-     */
-    public void setFExactCWords(boolean value)
-    {
-        field_6_docinfo1 = (byte)fExactCWords.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fExactCWords field value.
-     */
-    public boolean isFExactCWords()
-    {
-        return fExactCWords.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagHidden field value.
-     *
-     */
-    public void setFPagHidden(boolean value)
-    {
-        field_6_docinfo1 = (byte)fPagHidden.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fPagHidden field value.
-     */
-    public boolean isFPagHidden()
-    {
-        return fPagHidden.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagResults field value.
-     *
-     */
-    public void setFPagResults(boolean value)
-    {
-        field_6_docinfo1 = (byte)fPagResults.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fPagResults field value.
-     */
-    public boolean isFPagResults()
-    {
-        return fPagResults.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fLockAtn field value.
-     *
-     */
-    public void setFLockAtn(boolean value)
-    {
-        field_6_docinfo1 = (byte)fLockAtn.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fLockAtn field value.
-     */
-    public boolean isFLockAtn()
-    {
-        return fLockAtn.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fMirrorMargins field value.
-     *
-     */
-    public void setFMirrorMargins(boolean value)
-    {
-        field_6_docinfo1 = (byte)fMirrorMargins.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fMirrorMargins field value.
-     */
-    public boolean isFMirrorMargins()
-    {
-        return fMirrorMargins.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the unused3 field value.
-     *
-     */
-    public void setUnused3(boolean value)
-    {
-        field_6_docinfo1 = (byte)unused3.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the unused3 field value.
-     */
-    public boolean isUnused3()
-    {
-        return unused3.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fDfltTrueType field value.
-     *
-     */
-    public void setFDfltTrueType(boolean value)
-    {
-        field_6_docinfo1 = (byte)fDfltTrueType.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     *
-     * @return  the fDfltTrueType field value.
-     */
-    public boolean isFDfltTrueType()
-    {
-        return fDfltTrueType.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagSupressTopSpacing field value.
-     *
-     */
-    public void setFPagSupressTopSpacing(boolean value)
-    {
-        field_7_docinfo2 = (byte)fPagSupressTopSpacing.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fPagSupressTopSpacing field value.
-     */
-    public boolean isFPagSupressTopSpacing()
-    {
-        return fPagSupressTopSpacing.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fProtEnabled field value.
-     *
-     */
-    public void setFProtEnabled(boolean value)
-    {
-        field_7_docinfo2 = (byte)fProtEnabled.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fProtEnabled field value.
-     */
-    public boolean isFProtEnabled()
-    {
-        return fProtEnabled.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fDispFormFldSel field value.
-     *
-     */
-    public void setFDispFormFldSel(boolean value)
-    {
-        field_7_docinfo2 = (byte)fDispFormFldSel.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fDispFormFldSel field value.
-     */
-    public boolean isFDispFormFldSel()
-    {
-        return fDispFormFldSel.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fRMView field value.
-     *
-     */
-    public void setFRMView(boolean value)
-    {
-        field_7_docinfo2 = (byte)fRMView.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fRMView field value.
-     */
-    public boolean isFRMView()
-    {
-        return fRMView.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fRMPrint field value.
-     *
-     */
-    public void setFRMPrint(boolean value)
-    {
-        field_7_docinfo2 = (byte)fRMPrint.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fRMPrint field value.
-     */
-    public boolean isFRMPrint()
-    {
-        return fRMPrint.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the unused4 field value.
-     *
-     */
-    public void setUnused4(boolean value)
-    {
-        field_7_docinfo2 = (byte)unused4.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the unused4 field value.
-     */
-    public boolean isUnused4()
-    {
-        return unused4.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fLockRev field value.
-     *
-     */
-    public void setFLockRev(boolean value)
-    {
-        field_7_docinfo2 = (byte)fLockRev.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fLockRev field value.
-     */
-    public boolean isFLockRev()
-    {
-        return fLockRev.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fEmbedFonts field value.
-     *
-     */
-    public void setFEmbedFonts(boolean value)
-    {
-        field_7_docinfo2 = (byte)fEmbedFonts.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     *
-     * @return  the fEmbedFonts field value.
-     */
-    public boolean isFEmbedFonts()
-    {
-        return fEmbedFonts.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the oldfNoTabForInd field value.
-     *
-     */
-    public void setOldfNoTabForInd(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfNoTabForInd.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfNoTabForInd field value.
-     */
-    public boolean isOldfNoTabForInd()
-    {
-        return oldfNoTabForInd.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfNoSpaceRaiseLower field value.
-     *
-     */
-    public void setOldfNoSpaceRaiseLower(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfNoSpaceRaiseLower.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfNoSpaceRaiseLower field value.
-     */
-    public boolean isOldfNoSpaceRaiseLower()
-    {
-        return oldfNoSpaceRaiseLower.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSuppressSpbfAfterPageBreak field value.
-     *
-     */
-    public void setOldfSuppressSpbfAfterPageBreak(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfSuppressSpbfAfterPageBreak.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfSuppressSpbfAfterPageBreak field value.
-     */
-    public boolean isOldfSuppressSpbfAfterPageBreak()
-    {
-        return oldfSuppressSpbfAfterPageBreak.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfWrapTrailSpaces field value.
-     *
-     */
-    public void setOldfWrapTrailSpaces(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfWrapTrailSpaces.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfWrapTrailSpaces field value.
-     */
-    public boolean isOldfWrapTrailSpaces()
-    {
-        return oldfWrapTrailSpaces.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfMapPrintTextColor field value.
-     *
-     */
-    public void setOldfMapPrintTextColor(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfMapPrintTextColor.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfMapPrintTextColor field value.
-     */
-    public boolean isOldfMapPrintTextColor()
-    {
-        return oldfMapPrintTextColor.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfNoColumnBalance field value.
-     *
-     */
-    public void setOldfNoColumnBalance(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfNoColumnBalance.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfNoColumnBalance field value.
-     */
-    public boolean isOldfNoColumnBalance()
-    {
-        return oldfNoColumnBalance.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfConvMailMergeEsc field value.
-     *
-     */
-    public void setOldfConvMailMergeEsc(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfConvMailMergeEsc.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfConvMailMergeEsc field value.
-     */
-    public boolean isOldfConvMailMergeEsc()
-    {
-        return oldfConvMailMergeEsc.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSupressTopSpacing field value.
-     *
-     */
-    public void setOldfSupressTopSpacing(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfSupressTopSpacing.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfSupressTopSpacing field value.
-     */
-    public boolean isOldfSupressTopSpacing()
-    {
-        return oldfSupressTopSpacing.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfOrigWordTableRules field value.
-     *
-     */
-    public void setOldfOrigWordTableRules(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfOrigWordTableRules.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfOrigWordTableRules field value.
-     */
-    public boolean isOldfOrigWordTableRules()
-    {
-        return oldfOrigWordTableRules.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfTransparentMetafiles field value.
-     *
-     */
-    public void setOldfTransparentMetafiles(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfTransparentMetafiles.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfTransparentMetafiles field value.
-     */
-    public boolean isOldfTransparentMetafiles()
-    {
-        return oldfTransparentMetafiles.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfShowBreaksInFrames field value.
-     *
-     */
-    public void setOldfShowBreaksInFrames(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfShowBreaksInFrames.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfShowBreaksInFrames field value.
-     */
-    public boolean isOldfShowBreaksInFrames()
-    {
-        return oldfShowBreaksInFrames.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSwapBordersFacingPgs field value.
-     *
-     */
-    public void setOldfSwapBordersFacingPgs(boolean value)
-    {
-        field_8_docinfo3 = (short)oldfSwapBordersFacingPgs.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the oldfSwapBordersFacingPgs field value.
-     */
-    public boolean isOldfSwapBordersFacingPgs()
-    {
-        return oldfSwapBordersFacingPgs.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the unused5 field value.
-     *
-     */
-    public void setUnused5(byte value)
-    {
-        field_8_docinfo3 = (short)unused5.setValue(field_8_docinfo3, value);
-    }
-
-    /**
-     *
-     * @return  the unused5 field value.
-     */
-    public byte getUnused5()
-    {
-        return ( byte )unused5.getValue(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the rncEdn field value.
-     *
-     */
-    public void setRncEdn(byte value)
-    {
-        field_23_Edn = (short)rncEdn.setValue(field_23_Edn, value);
-    }
-
-    /**
-     *
-     * @return  the rncEdn field value.
-     */
-    public byte getRncEdn()
-    {
-        return ( byte )rncEdn.getValue(field_23_Edn);
-    }
-
-    /**
-     * Sets the nEdn field value.
-     *
-     */
-    public void setNEdn(short value)
-    {
-        field_23_Edn = (short)nEdn.setValue(field_23_Edn, value);
-    }
-
-    /**
-     *
-     * @return  the nEdn field value.
-     */
-    public short getNEdn()
-    {
-        return ( short )nEdn.getValue(field_23_Edn);
-    }
-
-    /**
-     * Sets the epc field value.
-     *
-     */
-    public void setEpc(byte value)
-    {
-        field_24_Edn1 = (short)epc.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the epc field value.
-     */
-    public byte getEpc()
-    {
-        return ( byte )epc.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the nfcFtnRef1 field value.
-     *
-     */
-    public void setNfcFtnRef1(byte value)
-    {
-        field_24_Edn1 = (short)nfcFtnRef1.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the nfcFtnRef1 field value.
-     */
-    public byte getNfcFtnRef1()
-    {
-        return ( byte )nfcFtnRef1.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the nfcEdnRef1 field value.
-     *
-     */
-    public void setNfcEdnRef1(byte value)
-    {
-        field_24_Edn1 = (short)nfcEdnRef1.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the nfcEdnRef1 field value.
-     */
-    public byte getNfcEdnRef1()
-    {
-        return ( byte )nfcEdnRef1.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fPrintFormData field value.
-     *
-     */
-    public void setFPrintFormData(boolean value)
-    {
-        field_24_Edn1 = (short)fPrintFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the fPrintFormData field value.
-     */
-    public boolean isFPrintFormData()
-    {
-        return fPrintFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fSaveFormData field value.
-     *
-     */
-    public void setFSaveFormData(boolean value)
-    {
-        field_24_Edn1 = (short)fSaveFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the fSaveFormData field value.
-     */
-    public boolean isFSaveFormData()
-    {
-        return fSaveFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fShadeFormData field value.
-     *
-     */
-    public void setFShadeFormData(boolean value)
-    {
-        field_24_Edn1 = (short)fShadeFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the fShadeFormData field value.
-     */
-    public boolean isFShadeFormData()
-    {
-        return fShadeFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fWCFtnEdn field value.
-     *
-     */
-    public void setFWCFtnEdn(boolean value)
-    {
-        field_24_Edn1 = (short)fWCFtnEdn.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     *
-     * @return  the fWCFtnEdn field value.
-     */
-    public boolean isFWCFtnEdn()
-    {
-        return fWCFtnEdn.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the wvkSaved field value.
-     *
-     */
-    public void setWvkSaved(byte value)
-    {
-        field_32_view = (short)wvkSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     *
-     * @return  the wvkSaved field value.
-     */
-    public byte getWvkSaved()
-    {
-        return ( byte )wvkSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the wScaleSaved field value.
-     *
-     */
-    public void setWScaleSaved(short value)
-    {
-        field_32_view = (short)wScaleSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     *
-     * @return  the wScaleSaved field value.
-     */
-    public short getWScaleSaved()
-    {
-        return ( short )wScaleSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the zkSaved field value.
-     *
-     */
-    public void setZkSaved(byte value)
-    {
-        field_32_view = (short)zkSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     *
-     * @return  the zkSaved field value.
-     */
-    public byte getZkSaved()
-    {
-        return ( byte )zkSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the fRotateFontW6 field value.
-     *
-     */
-    public void setFRotateFontW6(boolean value)
-    {
-        field_32_view = (short)fRotateFontW6.setBoolean(field_32_view, value);
-    }
-
-    /**
-     *
-     * @return  the fRotateFontW6 field value.
-     */
-    public boolean isFRotateFontW6()
-    {
-        return fRotateFontW6.isSet(field_32_view);
-    }
-
-    /**
-     * Sets the iGutterPos field value.
-     *
-     */
-    public void setIGutterPos(boolean value)
-    {
-        field_32_view = (short)iGutterPos.setBoolean(field_32_view, value);
-    }
-
-    /**
-     *
-     * @return  the iGutterPos field value.
-     */
-    public boolean isIGutterPos()
-    {
-        return iGutterPos.isSet(field_32_view);
-    }
-
-    /**
-     * Sets the fNoTabForInd field value.
-     *
-     */
-    public void setFNoTabForInd(boolean value)
-    {
-        field_33_docinfo4 = fNoTabForInd.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fNoTabForInd field value.
-     */
-    public boolean isFNoTabForInd()
-    {
-        return fNoTabForInd.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoSpaceRaiseLower field value.
-     *
-     */
-    public void setFNoSpaceRaiseLower(boolean value)
-    {
-        field_33_docinfo4 = fNoSpaceRaiseLower.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fNoSpaceRaiseLower field value.
-     */
-    public boolean isFNoSpaceRaiseLower()
-    {
-        return fNoSpaceRaiseLower.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSupressSpdfAfterPageBreak field value.
-     *
-     */
-    public void setFSupressSpdfAfterPageBreak(boolean value)
-    {
-        field_33_docinfo4 = fSupressSpdfAfterPageBreak.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fSupressSpdfAfterPageBreak field value.
-     */
-    public boolean isFSupressSpdfAfterPageBreak()
-    {
-        return fSupressSpdfAfterPageBreak.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fWrapTrailSpaces field value.
-     *
-     */
-    public void setFWrapTrailSpaces(boolean value)
-    {
-        field_33_docinfo4 = fWrapTrailSpaces.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fWrapTrailSpaces field value.
-     */
-    public boolean isFWrapTrailSpaces()
-    {
-        return fWrapTrailSpaces.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fMapPrintTextColor field value.
-     *
-     */
-    public void setFMapPrintTextColor(boolean value)
-    {
-        field_33_docinfo4 = fMapPrintTextColor.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fMapPrintTextColor field value.
-     */
-    public boolean isFMapPrintTextColor()
-    {
-        return fMapPrintTextColor.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoColumnBalance field value.
-     *
-     */
-    public void setFNoColumnBalance(boolean value)
-    {
-        field_33_docinfo4 = fNoColumnBalance.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fNoColumnBalance field value.
-     */
-    public boolean isFNoColumnBalance()
-    {
-        return fNoColumnBalance.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fConvMailMergeEsc field value.
-     *
-     */
-    public void setFConvMailMergeEsc(boolean value)
-    {
-        field_33_docinfo4 = fConvMailMergeEsc.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fConvMailMergeEsc field value.
-     */
-    public boolean isFConvMailMergeEsc()
-    {
-        return fConvMailMergeEsc.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSupressTopSpacing field value.
-     *
-     */
-    public void setFSupressTopSpacing(boolean value)
-    {
-        field_33_docinfo4 = fSupressTopSpacing.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fSupressTopSpacing field value.
-     */
-    public boolean isFSupressTopSpacing()
-    {
-        return fSupressTopSpacing.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fOrigWordTableRules field value.
-     *
-     */
-    public void setFOrigWordTableRules(boolean value)
-    {
-        field_33_docinfo4 = fOrigWordTableRules.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fOrigWordTableRules field value.
-     */
-    public boolean isFOrigWordTableRules()
-    {
-        return fOrigWordTableRules.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fTransparentMetafiles field value.
-     *
-     */
-    public void setFTransparentMetafiles(boolean value)
-    {
-        field_33_docinfo4 = fTransparentMetafiles.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fTransparentMetafiles field value.
-     */
-    public boolean isFTransparentMetafiles()
-    {
-        return fTransparentMetafiles.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fShowBreaksInFrames field value.
-     *
-     */
-    public void setFShowBreaksInFrames(boolean value)
-    {
-        field_33_docinfo4 = fShowBreaksInFrames.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fShowBreaksInFrames field value.
-     */
-    public boolean isFShowBreaksInFrames()
-    {
-        return fShowBreaksInFrames.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSwapBordersFacingPgs field value.
-     *
-     */
-    public void setFSwapBordersFacingPgs(boolean value)
-    {
-        field_33_docinfo4 = fSwapBordersFacingPgs.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fSwapBordersFacingPgs field value.
-     */
-    public boolean isFSwapBordersFacingPgs()
-    {
-        return fSwapBordersFacingPgs.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSuppressTopSPacingMac5 field value.
-     *
-     */
-    public void setFSuppressTopSPacingMac5(boolean value)
-    {
-        field_33_docinfo4 = fSuppressTopSPacingMac5.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fSuppressTopSPacingMac5 field value.
-     */
-    public boolean isFSuppressTopSPacingMac5()
-    {
-        return fSuppressTopSPacingMac5.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fTruncDxaExpand field value.
-     *
-     */
-    public void setFTruncDxaExpand(boolean value)
-    {
-        field_33_docinfo4 = fTruncDxaExpand.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fTruncDxaExpand field value.
-     */
-    public boolean isFTruncDxaExpand()
-    {
-        return fTruncDxaExpand.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fPrintBodyBeforeHdr field value.
-     *
-     */
-    public void setFPrintBodyBeforeHdr(boolean value)
-    {
-        field_33_docinfo4 = fPrintBodyBeforeHdr.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fPrintBodyBeforeHdr field value.
-     */
-    public boolean isFPrintBodyBeforeHdr()
-    {
-        return fPrintBodyBeforeHdr.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoLeading field value.
-     *
-     */
-    public void setFNoLeading(boolean value)
-    {
-        field_33_docinfo4 = fNoLeading.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fNoLeading field value.
-     */
-    public boolean isFNoLeading()
-    {
-        return fNoLeading.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fMWSmallCaps field value.
-     *
-     */
-    public void setFMWSmallCaps(boolean value)
-    {
-        field_33_docinfo4 = fMWSmallCaps.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     *
-     * @return  the fMWSmallCaps field value.
-     */
-    public boolean isFMWSmallCaps()
-    {
-        return fMWSmallCaps.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the lvl field value.
-     *
-     */
-    public void setLvl(byte value)
-    {
-        field_37_docinfo5 = (short)lvl.setValue(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the lvl field value.
-     */
-    public byte getLvl()
-    {
-        return ( byte )lvl.getValue(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fGramAllDone field value.
-     *
-     */
-    public void setFGramAllDone(boolean value)
-    {
-        field_37_docinfo5 = (short)fGramAllDone.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fGramAllDone field value.
-     */
-    public boolean isFGramAllDone()
-    {
-        return fGramAllDone.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fGramAllClean field value.
-     *
-     */
-    public void setFGramAllClean(boolean value)
-    {
-        field_37_docinfo5 = (short)fGramAllClean.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fGramAllClean field value.
-     */
-    public boolean isFGramAllClean()
-    {
-        return fGramAllClean.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fSubsetFonts field value.
-     *
-     */
-    public void setFSubsetFonts(boolean value)
-    {
-        field_37_docinfo5 = (short)fSubsetFonts.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fSubsetFonts field value.
-     */
-    public boolean isFSubsetFonts()
-    {
-        return fSubsetFonts.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHideLastVersion field value.
-     *
-     */
-    public void setFHideLastVersion(boolean value)
-    {
-        field_37_docinfo5 = (short)fHideLastVersion.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fHideLastVersion field value.
-     */
-    public boolean isFHideLastVersion()
-    {
-        return fHideLastVersion.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHtmlDoc field value.
-     *
-     */
-    public void setFHtmlDoc(boolean value)
-    {
-        field_37_docinfo5 = (short)fHtmlDoc.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fHtmlDoc field value.
-     */
-    public boolean isFHtmlDoc()
-    {
-        return fHtmlDoc.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fSnapBorder field value.
-     *
-     */
-    public void setFSnapBorder(boolean value)
-    {
-        field_37_docinfo5 = (short)fSnapBorder.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fSnapBorder field value.
-     */
-    public boolean isFSnapBorder()
-    {
-        return fSnapBorder.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fIncludeHeader field value.
-     *
-     */
-    public void setFIncludeHeader(boolean value)
-    {
-        field_37_docinfo5 = (short)fIncludeHeader.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fIncludeHeader field value.
-     */
-    public boolean isFIncludeHeader()
-    {
-        return fIncludeHeader.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fIncludeFooter field value.
-     *
-     */
-    public void setFIncludeFooter(boolean value)
-    {
-        field_37_docinfo5 = (short)fIncludeFooter.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fIncludeFooter field value.
-     */
-    public boolean isFIncludeFooter()
-    {
-        return fIncludeFooter.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fForcePageSizePag field value.
-     *
-     */
-    public void setFForcePageSizePag(boolean value)
-    {
-        field_37_docinfo5 = (short)fForcePageSizePag.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fForcePageSizePag field value.
-     */
-    public boolean isFForcePageSizePag()
-    {
-        return fForcePageSizePag.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fMinFontSizePag field value.
-     *
-     */
-    public void setFMinFontSizePag(boolean value)
-    {
-        field_37_docinfo5 = (short)fMinFontSizePag.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     *
-     * @return  the fMinFontSizePag field value.
-     */
-    public boolean isFMinFontSizePag()
-    {
-        return fMinFontSizePag.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHaveVersions field value.
-     *
-     */
-    public void setFHaveVersions(boolean value)
-    {
-        field_38_docinfo6 = (short)fHaveVersions.setBoolean(field_38_docinfo6, value);
-    }
-
-    /**
-     *
-     * @return  the fHaveVersions field value.
-     */
-    public boolean isFHaveVersions()
-    {
-        return fHaveVersions.isSet(field_38_docinfo6);
-    }
-
-    /**
-     * Sets the fAutoVersions field value.
-     *
-     */
-    public void setFAutoVersions(boolean value)
-    {
-        field_38_docinfo6 = (short)fAutoVersions.setBoolean(field_38_docinfo6, value);
-    }
-
-    /**
-     *
-     * @return  the fAutoVersions field value.
-     */
-    public boolean isFAutoVersions()
-    {
-        return fAutoVersions.isSet(field_38_docinfo6);
-    }
-
-    /**
-     * Sets the fVirusPrompted field value.
-     *
-     */
-    public void setFVirusPrompted(boolean value)
-    {
-        field_43_virusinfo = fVirusPrompted.setBoolean(field_43_virusinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fVirusPrompted field value.
-     */
-    public boolean isFVirusPrompted()
-    {
-        return fVirusPrompted.isSet(field_43_virusinfo);
-    }
-
-    /**
-     * Sets the fVirusLoadSafe field value.
-     *
-     */
-    public void setFVirusLoadSafe(boolean value)
-    {
-        field_43_virusinfo = fVirusLoadSafe.setBoolean(field_43_virusinfo, value);
-    }
-
-    /**
-     *
-     * @return  the fVirusLoadSafe field value.
-     */
-    public boolean isFVirusLoadSafe()
-    {
-        return fVirusLoadSafe.isSet(field_43_virusinfo);
-    }
-
-    /**
-     * Sets the KeyVirusSession30 field value.
-     *
-     */
-    public void setKeyVirusSession30(int value)
-    {
-        field_43_virusinfo = KeyVirusSession30.setValue(field_43_virusinfo, value);
-    }
-
-    /**
-     *
-     * @return  the KeyVirusSession30 field value.
-     */
-    public int getKeyVirusSession30()
-    {
-        return KeyVirusSession30.getValue(field_43_virusinfo);
-    }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
deleted file mode 100644
index bfdaf50bbd..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
+++ /dev/null
@@ -1,6014 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * File information Block.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author Andrew C. Oliver
- */
-@Deprecated
-public abstract class FIBAbstractType
-    implements HDFType
-{
-
-    private  int field_1_wIdent;
-    private  int field_2_nFib;
-    private  int field_3_nProduct;
-    private  int field_4_lid;
-    private  int field_5_pnNext;
-    private  short field_6_options;
-        private static BitField  fDot = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fGlsy = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fComplex = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fHasPic = BitFieldFactory.getInstance(0x0008);
-        private static BitField  cQuickSaves = BitFieldFactory.getInstance(0x00F0);
-        private static BitField  fEncrypted = BitFieldFactory.getInstance(0x0100);
-        private static BitField  fWhichTblStm = BitFieldFactory.getInstance(0x0200);
-        private static BitField  fReadOnlyRecommended = BitFieldFactory.getInstance(0x0400);
-        private static BitField  fWriteReservation = BitFieldFactory.getInstance(0x0800);
-        private static BitField  fExtChar = BitFieldFactory.getInstance(0x1000);
-        private static BitField  fLoadOverride = BitFieldFactory.getInstance(0x2000);
-        private static BitField  fFarEast = BitFieldFactory.getInstance(0x4000);
-        private static BitField  fCrypto = BitFieldFactory.getInstance(0x8000);
-    private  int field_7_nFibBack;
-    private  int field_8_lKey;
-    private  int field_9_envr;
-    private  short field_10_history;
-        private static BitField  fMac = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fEmptySpecial = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fLoadOverridePage = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fFutureSavedUndo = BitFieldFactory.getInstance(0x0008);
-        private static BitField  fWord97Saved = BitFieldFactory.getInstance(0x0010);
-        private static BitField  fSpare0 = BitFieldFactory.getInstance(0x00FE);
-    private  int field_11_chs;
-    private  int field_12_chsTables;
-    private  int field_13_fcMin;
-    private  int field_14_fcMac;
-    private  int field_15_csw;
-    private  int field_16_wMagicCreated;
-    private  int field_17_wMagicRevised;
-    private  int field_18_wMagicCreatedPrivate;
-    private  int field_19_wMagicRevisedPrivate;
-    private  int field_20_pnFbpChpFirst_W6;
-    private  int field_21_pnChpFirst_W6;
-    private  int field_22_cpnBteChp_W6;
-    private  int field_23_pnFbpPapFirst_W6;
-    private  int field_24_pnPapFirst_W6;
-    private  int field_25_cpnBtePap_W6;
-    private  int field_26_pnFbpLvcFirst_W6;
-    private  int field_27_pnLvcFirst_W6;
-    private  int field_28_cpnBteLvc_W6;
-    private  int field_29_lidFE;
-    private  int field_30_clw;
-    private  int field_31_cbMac;
-    private  int field_32_lProductCreated;
-    private  int field_33_lProductRevised;
-    private  int field_34_ccpText;
-    private  int field_35_ccpFtn;
-    private  int field_36_ccpHdd;
-    private  int field_37_ccpMcr;
-    private  int field_38_ccpAtn;
-    private  int field_39_ccpEdn;
-    private  int field_40_ccpTxbx;
-    private  int field_41_ccpHdrTxbx;
-    private  int field_42_pnFbpChpFirst;
-    private  int field_43_pnChpFirst;
-    private  int field_44_cpnBteChp;
-    private  int field_45_pnFbpPapFirst;
-    private  int field_46_pnPapFirst;
-    private  int field_47_cpnBtePap;
-    private  int field_48_pnFbpLvcFirst;
-    private  int field_49_pnLvcFirst;
-    private  int field_50_cpnBteLvc;
-    private  int field_51_fcIslandFirst;
-    private  int field_52_fcIslandLim;
-    private  int field_53_cfclcb;
-    private  int field_54_fcStshfOrig;
-    private  int field_55_lcbStshfOrig;
-    private  int field_56_fcStshf;
-    private  int field_57_lcbStshf;
-    private  int field_58_fcPlcffndRef;
-    private  int field_59_lcbPlcffndRef;
-    private  int field_60_fcPlcffndTxt;
-    private  int field_61_lcbPlcffndTxt;
-    private  int field_62_fcPlcfandRef;
-    private  int field_63_lcbPlcfandRef;
-    private  int field_64_fcPlcfandTxt;
-    private  int field_65_lcbPlcfandTxt;
-    private  int field_66_fcPlcfsed;
-    private  int field_67_lcbPlcfsed;
-    private  int field_68_fcPlcpad;
-    private  int field_69_lcbPlcpad;
-    private  int field_70_fcPlcfphe;
-    private  int field_71_lcbPlcfphe;
-    private  int field_72_fcSttbfglsy;
-    private  int field_73_lcbSttbfglsy;
-    private  int field_74_fcPlcfglsy;
-    private  int field_75_lcbPlcfglsy;
-    private  int field_76_fcPlcfhdd;
-    private  int field_77_lcbPlcfhdd;
-    private  int field_78_fcPlcfbteChpx;
-    private  int field_79_lcbPlcfbteChpx;
-    private  int field_80_fcPlcfbtePapx;
-    private  int field_81_lcbPlcfbtePapx;
-    private  int field_82_fcPlcfsea;
-    private  int field_83_lcbPlcfsea;
-    private  int field_84_fcSttbfffn;
-    private  int field_85_lcbSttbfffn;
-    private  int field_86_fcPlcffldMom;
-    private  int field_87_lcbPlcffldMom;
-    private  int field_88_fcPlcffldHdr;
-    private  int field_89_lcbPlcffldHdr;
-    private  int field_90_fcPlcffldFtn;
-    private  int field_91_lcbPlcffldFtn;
-    private  int field_92_fcPlcffldAtn;
-    private  int field_93_lcbPlcffldAtn;
-    private  int field_94_fcPlcffldMcr;
-    private  int field_95_lcbPlcffldMcr;
-    private  int field_96_fcSttbfbkmk;
-    private  int field_97_lcbSttbfbkmk;
-    private  int field_98_fcPlcfbkf;
-    private  int field_99_lcbPlcfbkf;
-    private  int field_100_fcPlcfbkl;
-    private  int field_101_lcbPlcfbkl;
-    private  int field_102_fcCmds;
-    private  int field_103_lcbCmds;
-    private  int field_104_fcPlcmcr;
-    private  int field_105_lcbPlcmcr;
-    private  int field_106_fcSttbfmcr;
-    private  int field_107_lcbSttbfmcr;
-    private  int field_108_fcPrDrvr;
-    private  int field_109_lcbPrDrvr;
-    private  int field_110_fcPrEnvPort;
-    private  int field_111_lcbPrEnvPort;
-    private  int field_112_fcPrEnvLand;
-    private  int field_113_lcbPrEnvLand;
-    private  int field_114_fcWss;
-    private  int field_115_lcbWss;
-    private  int field_116_fcDop;
-    private  int field_117_lcbDop;
-    private  int field_118_fcSttbfAssoc;
-    private  int field_119_lcbSttbfAssoc;
-    private  int field_120_fcClx;
-    private  int field_121_lcbClx;
-    private  int field_122_fcPlcfpgdFtn;
-    private  int field_123_lcbPlcfpgdFtn;
-    private  int field_124_fcAutosaveSource;
-    private  int field_125_lcbAutosaveSource;
-    private  int field_126_fcGrpXstAtnOwners;
-    private  int field_127_lcbGrpXstAtnOwners;
-    private  int field_128_fcSttbfAtnbkmk;
-    private  int field_129_lcbSttbfAtnbkmk;
-    private  int field_130_fcPlcdoaMom;
-    private  int field_131_lcbPlcdoaMom;
-    private  int field_132_fcPlcdoaHdr;
-    private  int field_133_lcbPlcdoaHdr;
-    private  int field_134_fcPlcspaMom;
-    private  int field_135_lcbPlcspaMom;
-    private  int field_136_fcPlcspaHdr;
-    private  int field_137_lcbPlcspaHdr;
-    private  int field_138_fcPlcfAtnbkf;
-    private  int field_139_lcbPlcfAtnbkf;
-    private  int field_140_fcPlcfAtnbkl;
-    private  int field_141_lcbPlcfAtnbkl;
-    private  int field_142_fcPms;
-    private  int field_143_lcbPms;
-    private  int field_144_fcFormFldSttbs;
-    private  int field_145_lcbFormFldSttbs;
-    private  int field_146_fcPlcfendRef;
-    private  int field_147_lcbPlcfendRef;
-    private  int field_148_fcPlcfendTxt;
-    private  int field_149_lcbPlcfendTxt;
-    private  int field_150_fcPlcffldEdn;
-    private  int field_151_lcbPlcffldEdn;
-    private  int field_152_fcPlcfpgdEdn;
-    private  int field_153_lcbPlcfpgdEdn;
-    private  int field_154_fcDggInfo;
-    private  int field_155_lcbDggInfo;
-    private  int field_156_fcSttbfRMark;
-    private  int field_157_lcbSttbfRMark;
-    private  int field_158_fcSttbCaption;
-    private  int field_159_lcbSttbCaption;
-    private  int field_160_fcSttbAutoCaption;
-    private  int field_161_lcbSttbAutoCaption;
-    private  int field_162_fcPlcfwkb;
-    private  int field_163_lcbPlcfwkb;
-    private  int field_164_fcPlcfspl;
-    private  int field_165_lcbPlcfspl;
-    private  int field_166_fcPlcftxbxTxt;
-    private  int field_167_lcbPlcftxbxTxt;
-    private  int field_168_fcPlcffldTxbx;
-    private  int field_169_lcbPlcffldTxbx;
-    private  int field_170_fcPlcfhdrtxbxTxt;
-    private  int field_171_lcbPlcfhdrtxbxTxt;
-    private  int field_172_fcPlcffldHdrTxbx;
-    private  int field_173_lcbPlcffldHdrTxbx;
-    private  int field_174_fcStwUser;
-    private  int field_175_lcbStwUser;
-    private  int field_176_fcSttbttmbd;
-    private  int field_177_cbSttbttmbd;
-    private  int field_178_fcUnused;
-    private  int field_179_lcbUnused;
-    private  int field_180_fcPgdMother;
-    private  int field_181_lcbPgdMother;
-    private  int field_182_fcBkdMother;
-    private  int field_183_lcbBkdMother;
-    private  int field_184_fcPgdFtn;
-    private  int field_185_lcbPgdFtn;
-    private  int field_186_fcBkdFtn;
-    private  int field_187_lcbBkdFtn;
-    private  int field_188_fcPgdEdn;
-    private  int field_189_lcbPgdEdn;
-    private  int field_190_fcBkdEdn;
-    private  int field_191_lcbBkdEdn;
-    private  int field_192_fcSttbfIntlFld;
-    private  int field_193_lcbSttbfIntlFld;
-    private  int field_194_fcRouteSlip;
-    private  int field_195_lcbRouteSlip;
-    private  int field_196_fcSttbSavedBy;
-    private  int field_197_lcbSttbSavedBy;
-    private  int field_198_fcSttbFnm;
-    private  int field_199_lcbSttbFnm;
-    private  int field_200_fcPlcfLst;
-    private  int field_201_lcbPlcfLst;
-    private  int field_202_fcPlfLfo;
-    private  int field_203_lcbPlfLfo;
-    private  int field_204_fcPlcftxbxBkd;
-    private  int field_205_lcbPlcftxbxBkd;
-    private  int field_206_fcPlcftxbxHdrBkd;
-    private  int field_207_lcbPlcftxbxHdrBkd;
-    private  int field_208_fcDocUndo;
-    private  int field_209_lcbDocUndo;
-    private  int field_210_fcRgbuse;
-    private  int field_211_lcbRgbuse;
-    private  int field_212_fcUsp;
-    private  int field_213_lcbUsp;
-    private  int field_214_fcUskf;
-    private  int field_215_lcbUskf;
-    private  int field_216_fcPlcupcRgbuse;
-    private  int field_217_lcbPlcupcRgbuse;
-    private  int field_218_fcPlcupcUsp;
-    private  int field_219_lcbPlcupcUsp;
-    private  int field_220_fcSttbGlsyStyle;
-    private  int field_221_lcbSttbGlsyStyle;
-    private  int field_222_fcPlgosl;
-    private  int field_223_lcbPlgosl;
-    private  int field_224_fcPlcocx;
-    private  int field_225_lcbPlcocx;
-    private  int field_226_fcPlcfbteLvc;
-    private  int field_227_lcbPlcfbteLvc;
-    private  int field_228_dwLowDateTime;
-    private  int field_229_dwHighDateTime;
-    private  int field_230_fcPlcflvc;
-    private  int field_231_lcbPlcflvc;
-    private  int field_232_fcPlcasumy;
-    private  int field_233_lcbPlcasumy;
-    private  int field_234_fcPlcfgram;
-    private  int field_235_lcbPlcfgram;
-    private  int field_236_fcSttbListNames;
-    private  int field_237_lcbSttbListNames;
-    private  int field_238_fcSttbfUssr;
-    private  int field_239_lcbSttbfUssr;
-
-
-    public FIBAbstractType()
-    {
-
-    }
-
-    protected void fillFields(byte [] data, short size, int offset)
-    {
-        field_1_wIdent                  = LittleEndian.getShort(data, 0x0 + offset);
-        field_2_nFib                    = LittleEndian.getShort(data, 0x2 + offset);
-        field_3_nProduct                = LittleEndian.getShort(data, 0x4 + offset);
-        field_4_lid                     = LittleEndian.getShort(data, 0x6 + offset);
-        field_5_pnNext                  = LittleEndian.getShort(data, 0x8 + offset);
-        field_6_options                 = LittleEndian.getShort(data, 0xa + offset);
-        field_7_nFibBack                = LittleEndian.getShort(data, 0xc + offset);
-        field_8_lKey                    = LittleEndian.getShort(data, 0xe + offset);
-        field_9_envr                    = LittleEndian.getShort(data, 0x10 + offset);
-        field_10_history                = LittleEndian.getShort(data, 0x12 + offset);
-        field_11_chs                    = LittleEndian.getShort(data, 0x14 + offset);
-        field_12_chsTables              = LittleEndian.getShort(data, 0x16 + offset);
-        field_13_fcMin                  = LittleEndian.getInt(data, 0x18 + offset);
-        field_14_fcMac                  = LittleEndian.getInt(data, 0x1c + offset);
-        field_15_csw                    = LittleEndian.getShort(data, 0x20 + offset);
-        field_16_wMagicCreated          = LittleEndian.getShort(data, 0x22 + offset);
-        field_17_wMagicRevised          = LittleEndian.getShort(data, 0x24 + offset);
-        field_18_wMagicCreatedPrivate   = LittleEndian.getShort(data, 0x26 + offset);
-        field_19_wMagicRevisedPrivate   = LittleEndian.getShort(data, 0x28 + offset);
-        field_20_pnFbpChpFirst_W6       = LittleEndian.getShort(data, 0x2a + offset);
-        field_21_pnChpFirst_W6          = LittleEndian.getShort(data, 0x2c + offset);
-        field_22_cpnBteChp_W6           = LittleEndian.getShort(data, 0x2e + offset);
-        field_23_pnFbpPapFirst_W6       = LittleEndian.getShort(data, 0x30 + offset);
-        field_24_pnPapFirst_W6          = LittleEndian.getShort(data, 0x32 + offset);
-        field_25_cpnBtePap_W6           = LittleEndian.getShort(data, 0x34 + offset);
-        field_26_pnFbpLvcFirst_W6       = LittleEndian.getShort(data, 0x36 + offset);
-        field_27_pnLvcFirst_W6          = LittleEndian.getShort(data, 0x38 + offset);
-        field_28_cpnBteLvc_W6           = LittleEndian.getShort(data, 0x3a + offset);
-        field_29_lidFE                  = LittleEndian.getShort(data, 0x3c + offset);
-        field_30_clw                    = LittleEndian.getShort(data, 0x3e + offset);
-        field_31_cbMac                  = LittleEndian.getInt(data, 0x40 + offset);
-        field_32_lProductCreated        = LittleEndian.getInt(data, 0x44 + offset);
-        field_33_lProductRevised        = LittleEndian.getInt(data, 0x48 + offset);
-        field_34_ccpText                = LittleEndian.getInt(data, 0x4c + offset);
-        field_35_ccpFtn                 = LittleEndian.getInt(data, 0x50 + offset);
-        field_36_ccpHdd                 = LittleEndian.getInt(data, 0x54 + offset);
-        field_37_ccpMcr                 = LittleEndian.getInt(data, 0x58 + offset);
-        field_38_ccpAtn                 = LittleEndian.getInt(data, 0x5c + offset);
-        field_39_ccpEdn                 = LittleEndian.getInt(data, 0x60 + offset);
-        field_40_ccpTxbx                = LittleEndian.getInt(data, 0x64 + offset);
-        field_41_ccpHdrTxbx             = LittleEndian.getInt(data, 0x68 + offset);
-        field_42_pnFbpChpFirst          = LittleEndian.getInt(data, 0x6c + offset);
-        field_43_pnChpFirst             = LittleEndian.getInt(data, 0x70 + offset);
-        field_44_cpnBteChp              = LittleEndian.getInt(data, 0x74 + offset);
-        field_45_pnFbpPapFirst          = LittleEndian.getInt(data, 0x78 + offset);
-        field_46_pnPapFirst             = LittleEndian.getInt(data, 0x7c + offset);
-        field_47_cpnBtePap              = LittleEndian.getInt(data, 0x80 + offset);
-        field_48_pnFbpLvcFirst          = LittleEndian.getInt(data, 0x84 + offset);
-        field_49_pnLvcFirst             = LittleEndian.getInt(data, 0x88 + offset);
-        field_50_cpnBteLvc              = LittleEndian.getInt(data, 0x8c + offset);
-        field_51_fcIslandFirst          = LittleEndian.getInt(data, 0x90 + offset);
-        field_52_fcIslandLim            = LittleEndian.getInt(data, 0x94 + offset);
-        field_53_cfclcb                 = LittleEndian.getShort(data, 0x98 + offset);
-        field_54_fcStshfOrig            = LittleEndian.getInt(data, 0x9a + offset);
-        field_55_lcbStshfOrig           = LittleEndian.getInt(data, 0x9e + offset);
-        field_56_fcStshf                = LittleEndian.getInt(data, 0xa2 + offset);
-        field_57_lcbStshf               = LittleEndian.getInt(data, 0xa6 + offset);
-        field_58_fcPlcffndRef           = LittleEndian.getInt(data, 0xaa + offset);
-        field_59_lcbPlcffndRef          = LittleEndian.getInt(data, 0xae + offset);
-        field_60_fcPlcffndTxt           = LittleEndian.getInt(data, 0xb2 + offset);
-        field_61_lcbPlcffndTxt          = LittleEndian.getInt(data, 0xb6 + offset);
-        field_62_fcPlcfandRef           = LittleEndian.getInt(data, 0xba + offset);
-        field_63_lcbPlcfandRef          = LittleEndian.getInt(data, 0xbe + offset);
-        field_64_fcPlcfandTxt           = LittleEndian.getInt(data, 0xc2 + offset);
-        field_65_lcbPlcfandTxt          = LittleEndian.getInt(data, 0xc6 + offset);
-        field_66_fcPlcfsed              = LittleEndian.getInt(data, 0xca + offset);
-        field_67_lcbPlcfsed             = LittleEndian.getInt(data, 0xce + offset);
-        field_68_fcPlcpad               = LittleEndian.getInt(data, 0xd2 + offset);
-        field_69_lcbPlcpad              = LittleEndian.getInt(data, 0xd6 + offset);
-        field_70_fcPlcfphe              = LittleEndian.getInt(data, 0xda + offset);
-        field_71_lcbPlcfphe             = LittleEndian.getInt(data, 0xde + offset);
-        field_72_fcSttbfglsy            = LittleEndian.getInt(data, 0xe2 + offset);
-        field_73_lcbSttbfglsy           = LittleEndian.getInt(data, 0xe6 + offset);
-        field_74_fcPlcfglsy             = LittleEndian.getInt(data, 0xea + offset);
-        field_75_lcbPlcfglsy            = LittleEndian.getInt(data, 0xee + offset);
-        field_76_fcPlcfhdd              = LittleEndian.getInt(data, 0xf2 + offset);
-        field_77_lcbPlcfhdd             = LittleEndian.getInt(data, 0xf6 + offset);
-        field_78_fcPlcfbteChpx          = LittleEndian.getInt(data, 0xfa + offset);
-        field_79_lcbPlcfbteChpx         = LittleEndian.getInt(data, 0xfe + offset);
-        field_80_fcPlcfbtePapx          = LittleEndian.getInt(data, 0x102 + offset);
-        field_81_lcbPlcfbtePapx         = LittleEndian.getInt(data, 0x106 + offset);
-        field_82_fcPlcfsea              = LittleEndian.getInt(data, 0x10a + offset);
-        field_83_lcbPlcfsea             = LittleEndian.getInt(data, 0x10e + offset);
-        field_84_fcSttbfffn             = LittleEndian.getInt(data, 0x112 + offset);
-        field_85_lcbSttbfffn            = LittleEndian.getInt(data, 0x116 + offset);
-        field_86_fcPlcffldMom           = LittleEndian.getInt(data, 0x11a + offset);
-        field_87_lcbPlcffldMom          = LittleEndian.getInt(data, 0x11e + offset);
-        field_88_fcPlcffldHdr           = LittleEndian.getInt(data, 0x122 + offset);
-        field_89_lcbPlcffldHdr          = LittleEndian.getInt(data, 0x126 + offset);
-        field_90_fcPlcffldFtn           = LittleEndian.getInt(data, 0x12a + offset);
-        field_91_lcbPlcffldFtn          = LittleEndian.getInt(data, 0x12e + offset);
-        field_92_fcPlcffldAtn           = LittleEndian.getInt(data, 0x132 + offset);
-        field_93_lcbPlcffldAtn          = LittleEndian.getInt(data, 0x136 + offset);
-        field_94_fcPlcffldMcr           = LittleEndian.getInt(data, 0x13a + offset);
-        field_95_lcbPlcffldMcr          = LittleEndian.getInt(data, 0x13e + offset);
-        field_96_fcSttbfbkmk            = LittleEndian.getInt(data, 0x142 + offset);
-        field_97_lcbSttbfbkmk           = LittleEndian.getInt(data, 0x146 + offset);
-        field_98_fcPlcfbkf              = LittleEndian.getInt(data, 0x14a + offset);
-        field_99_lcbPlcfbkf             = LittleEndian.getInt(data, 0x14e + offset);
-        field_100_fcPlcfbkl             = LittleEndian.getInt(data, 0x152 + offset);
-        field_101_lcbPlcfbkl            = LittleEndian.getInt(data, 0x156 + offset);
-        field_102_fcCmds                = LittleEndian.getInt(data, 0x15a + offset);
-        field_103_lcbCmds               = LittleEndian.getInt(data, 0x15e + offset);
-        field_104_fcPlcmcr              = LittleEndian.getInt(data, 0x162 + offset);
-        field_105_lcbPlcmcr             = LittleEndian.getInt(data, 0x166 + offset);
-        field_106_fcSttbfmcr            = LittleEndian.getInt(data, 0x16a + offset);
-        field_107_lcbSttbfmcr           = LittleEndian.getInt(data, 0x16e + offset);
-        field_108_fcPrDrvr              = LittleEndian.getInt(data, 0x172 + offset);
-        field_109_lcbPrDrvr             = LittleEndian.getInt(data, 0x176 + offset);
-        field_110_fcPrEnvPort           = LittleEndian.getInt(data, 0x17a + offset);
-        field_111_lcbPrEnvPort          = LittleEndian.getInt(data, 0x17e + offset);
-        field_112_fcPrEnvLand           = LittleEndian.getInt(data, 0x182 + offset);
-        field_113_lcbPrEnvLand          = LittleEndian.getInt(data, 0x186 + offset);
-        field_114_fcWss                 = LittleEndian.getInt(data, 0x18a + offset);
-        field_115_lcbWss                = LittleEndian.getInt(data, 0x18e + offset);
-        field_116_fcDop                 = LittleEndian.getInt(data, 0x192 + offset);
-        field_117_lcbDop                = LittleEndian.getInt(data, 0x196 + offset);
-        field_118_fcSttbfAssoc          = LittleEndian.getInt(data, 0x19a + offset);
-        field_119_lcbSttbfAssoc         = LittleEndian.getInt(data, 0x19e + offset);
-        field_120_fcClx                 = LittleEndian.getInt(data, 0x1a2 + offset);
-        field_121_lcbClx                = LittleEndian.getInt(data, 0x1a6 + offset);
-        field_122_fcPlcfpgdFtn          = LittleEndian.getInt(data, 0x1aa + offset);
-        field_123_lcbPlcfpgdFtn         = LittleEndian.getInt(data, 0x1ae + offset);
-        field_124_fcAutosaveSource      = LittleEndian.getInt(data, 0x1b2 + offset);
-        field_125_lcbAutosaveSource     = LittleEndian.getInt(data, 0x1b6 + offset);
-        field_126_fcGrpXstAtnOwners     = LittleEndian.getInt(data, 0x1ba + offset);
-        field_127_lcbGrpXstAtnOwners    = LittleEndian.getInt(data, 0x1be + offset);
-        field_128_fcSttbfAtnbkmk        = LittleEndian.getInt(data, 0x1c2 + offset);
-        field_129_lcbSttbfAtnbkmk       = LittleEndian.getInt(data, 0x1c6 + offset);
-        field_130_fcPlcdoaMom           = LittleEndian.getInt(data, 0x1ca + offset);
-        field_131_lcbPlcdoaMom          = LittleEndian.getInt(data, 0x1ce + offset);
-        field_132_fcPlcdoaHdr           = LittleEndian.getInt(data, 0x1d2 + offset);
-        field_133_lcbPlcdoaHdr          = LittleEndian.getInt(data, 0x1d6 + offset);
-        field_134_fcPlcspaMom           = LittleEndian.getInt(data, 0x1da + offset);
-        field_135_lcbPlcspaMom          = LittleEndian.getInt(data, 0x1de + offset);
-        field_136_fcPlcspaHdr           = LittleEndian.getInt(data, 0x1e2 + offset);
-        field_137_lcbPlcspaHdr          = LittleEndian.getInt(data, 0x1e6 + offset);
-        field_138_fcPlcfAtnbkf          = LittleEndian.getInt(data, 0x1ea + offset);
-        field_139_lcbPlcfAtnbkf         = LittleEndian.getInt(data, 0x1ee + offset);
-        field_140_fcPlcfAtnbkl          = LittleEndian.getInt(data, 0x1f2 + offset);
-        field_141_lcbPlcfAtnbkl         = LittleEndian.getInt(data, 0x1f6 + offset);
-        field_142_fcPms                 = LittleEndian.getInt(data, 0x1fa + offset);
-        field_143_lcbPms                = LittleEndian.getInt(data, 0x1fe + offset);
-        field_144_fcFormFldSttbs        = LittleEndian.getInt(data, 0x202 + offset);
-        field_145_lcbFormFldSttbs       = LittleEndian.getInt(data, 0x206 + offset);
-        field_146_fcPlcfendRef          = LittleEndian.getInt(data, 0x20a + offset);
-        field_147_lcbPlcfendRef         = LittleEndian.getInt(data, 0x20e + offset);
-        field_148_fcPlcfendTxt          = LittleEndian.getInt(data, 0x212 + offset);
-        field_149_lcbPlcfendTxt         = LittleEndian.getInt(data, 0x216 + offset);
-        field_150_fcPlcffldEdn          = LittleEndian.getInt(data, 0x21a + offset);
-        field_151_lcbPlcffldEdn         = LittleEndian.getInt(data, 0x21e + offset);
-        field_152_fcPlcfpgdEdn          = LittleEndian.getInt(data, 0x222 + offset);
-        field_153_lcbPlcfpgdEdn         = LittleEndian.getInt(data, 0x226 + offset);
-        field_154_fcDggInfo             = LittleEndian.getInt(data, 0x22a + offset);
-        field_155_lcbDggInfo            = LittleEndian.getInt(data, 0x22e + offset);
-        field_156_fcSttbfRMark          = LittleEndian.getInt(data, 0x232 + offset);
-        field_157_lcbSttbfRMark         = LittleEndian.getInt(data, 0x236 + offset);
-        field_158_fcSttbCaption         = LittleEndian.getInt(data, 0x23a + offset);
-        field_159_lcbSttbCaption        = LittleEndian.getInt(data, 0x23e + offset);
-        field_160_fcSttbAutoCaption     = LittleEndian.getInt(data, 0x242 + offset);
-        field_161_lcbSttbAutoCaption    = LittleEndian.getInt(data, 0x246 + offset);
-        field_162_fcPlcfwkb             = LittleEndian.getInt(data, 0x24a + offset);
-        field_163_lcbPlcfwkb            = LittleEndian.getInt(data, 0x24e + offset);
-        field_164_fcPlcfspl             = LittleEndian.getInt(data, 0x252 + offset);
-        field_165_lcbPlcfspl            = LittleEndian.getInt(data, 0x256 + offset);
-        field_166_fcPlcftxbxTxt         = LittleEndian.getInt(data, 0x25a + offset);
-        field_167_lcbPlcftxbxTxt        = LittleEndian.getInt(data, 0x25e + offset);
-        field_168_fcPlcffldTxbx         = LittleEndian.getInt(data, 0x262 + offset);
-        field_169_lcbPlcffldTxbx        = LittleEndian.getInt(data, 0x266 + offset);
-        field_170_fcPlcfhdrtxbxTxt      = LittleEndian.getInt(data, 0x26a + offset);
-        field_171_lcbPlcfhdrtxbxTxt     = LittleEndian.getInt(data, 0x26e + offset);
-        field_172_fcPlcffldHdrTxbx      = LittleEndian.getInt(data, 0x272 + offset);
-        field_173_lcbPlcffldHdrTxbx     = LittleEndian.getInt(data, 0x276 + offset);
-        field_174_fcStwUser             = LittleEndian.getInt(data, 0x27a + offset);
-        field_175_lcbStwUser            = LittleEndian.getInt(data, 0x27e + offset);
-        field_176_fcSttbttmbd           = LittleEndian.getInt(data, 0x282 + offset);
-        field_177_cbSttbttmbd           = LittleEndian.getInt(data, 0x286 + offset);
-        field_178_fcUnused              = LittleEndian.getInt(data, 0x28a + offset);
-        field_179_lcbUnused             = LittleEndian.getInt(data, 0x28e + offset);
-        field_180_fcPgdMother           = LittleEndian.getInt(data, 0x292 + offset);
-        field_181_lcbPgdMother          = LittleEndian.getInt(data, 0x296 + offset);
-        field_182_fcBkdMother           = LittleEndian.getInt(data, 0x29a + offset);
-        field_183_lcbBkdMother          = LittleEndian.getInt(data, 0x29e + offset);
-        field_184_fcPgdFtn              = LittleEndian.getInt(data, 0x2a2 + offset);
-        field_185_lcbPgdFtn             = LittleEndian.getInt(data, 0x2a6 + offset);
-        field_186_fcBkdFtn              = LittleEndian.getInt(data, 0x2aa + offset);
-        field_187_lcbBkdFtn             = LittleEndian.getInt(data, 0x2ae + offset);
-        field_188_fcPgdEdn              = LittleEndian.getInt(data, 0x2b2 + offset);
-        field_189_lcbPgdEdn             = LittleEndian.getInt(data, 0x2b6 + offset);
-        field_190_fcBkdEdn              = LittleEndian.getInt(data, 0x2ba + offset);
-        field_191_lcbBkdEdn             = LittleEndian.getInt(data, 0x2be + offset);
-        field_192_fcSttbfIntlFld        = LittleEndian.getInt(data, 0x2c2 + offset);
-        field_193_lcbSttbfIntlFld       = LittleEndian.getInt(data, 0x2c6 + offset);
-        field_194_fcRouteSlip           = LittleEndian.getInt(data, 0x2ca + offset);
-        field_195_lcbRouteSlip          = LittleEndian.getInt(data, 0x2ce + offset);
-        field_196_fcSttbSavedBy         = LittleEndian.getInt(data, 0x2d2 + offset);
-        field_197_lcbSttbSavedBy        = LittleEndian.getInt(data, 0x2d6 + offset);
-        field_198_fcSttbFnm             = LittleEndian.getInt(data, 0x2da + offset);
-        field_199_lcbSttbFnm            = LittleEndian.getInt(data, 0x2de + offset);
-        field_200_fcPlcfLst             = LittleEndian.getInt(data, 0x2e2 + offset);
-        field_201_lcbPlcfLst            = LittleEndian.getInt(data, 0x2e6 + offset);
-        field_202_fcPlfLfo              = LittleEndian.getInt(data, 0x2ea + offset);
-        field_203_lcbPlfLfo             = LittleEndian.getInt(data, 0x2ee + offset);
-        field_204_fcPlcftxbxBkd         = LittleEndian.getInt(data, 0x2f2 + offset);
-        field_205_lcbPlcftxbxBkd        = LittleEndian.getInt(data, 0x2f6 + offset);
-        field_206_fcPlcftxbxHdrBkd      = LittleEndian.getInt(data, 0x2fa + offset);
-        field_207_lcbPlcftxbxHdrBkd     = LittleEndian.getInt(data, 0x2fe + offset);
-        field_208_fcDocUndo             = LittleEndian.getInt(data, 0x302 + offset);
-        field_209_lcbDocUndo            = LittleEndian.getInt(data, 0x306 + offset);
-        field_210_fcRgbuse              = LittleEndian.getInt(data, 0x30a + offset);
-        field_211_lcbRgbuse             = LittleEndian.getInt(data, 0x30e + offset);
-        field_212_fcUsp                 = LittleEndian.getInt(data, 0x312 + offset);
-        field_213_lcbUsp                = LittleEndian.getInt(data, 0x316 + offset);
-        field_214_fcUskf                = LittleEndian.getInt(data, 0x31a + offset);
-        field_215_lcbUskf               = LittleEndian.getInt(data, 0x31e + offset);
-        field_216_fcPlcupcRgbuse        = LittleEndian.getInt(data, 0x322 + offset);
-        field_217_lcbPlcupcRgbuse       = LittleEndian.getInt(data, 0x326 + offset);
-        field_218_fcPlcupcUsp           = LittleEndian.getInt(data, 0x32a + offset);
-        field_219_lcbPlcupcUsp          = LittleEndian.getInt(data, 0x32e + offset);
-        field_220_fcSttbGlsyStyle       = LittleEndian.getInt(data, 0x332 + offset);
-        field_221_lcbSttbGlsyStyle      = LittleEndian.getInt(data, 0x336 + offset);
-        field_222_fcPlgosl              = LittleEndian.getInt(data, 0x33a + offset);
-        field_223_lcbPlgosl             = LittleEndian.getInt(data, 0x33e + offset);
-        field_224_fcPlcocx              = LittleEndian.getInt(data, 0x342 + offset);
-        field_225_lcbPlcocx             = LittleEndian.getInt(data, 0x346 + offset);
-        field_226_fcPlcfbteLvc          = LittleEndian.getInt(data, 0x34a + offset);
-        field_227_lcbPlcfbteLvc         = LittleEndian.getInt(data, 0x34e + offset);
-        field_228_dwLowDateTime         = LittleEndian.getInt(data, 0x352 + offset);
-        field_229_dwHighDateTime        = LittleEndian.getInt(data, 0x356 + offset);
-        field_230_fcPlcflvc             = LittleEndian.getInt(data, 0x35a + offset);
-        field_231_lcbPlcflvc            = LittleEndian.getInt(data, 0x35e + offset);
-        field_232_fcPlcasumy            = LittleEndian.getInt(data, 0x362 + offset);
-        field_233_lcbPlcasumy           = LittleEndian.getInt(data, 0x366 + offset);
-        field_234_fcPlcfgram            = LittleEndian.getInt(data, 0x36a + offset);
-        field_235_lcbPlcfgram           = LittleEndian.getInt(data, 0x36e + offset);
-        field_236_fcSttbListNames       = LittleEndian.getInt(data, 0x372 + offset);
-        field_237_lcbSttbListNames      = LittleEndian.getInt(data, 0x376 + offset);
-        field_238_fcSttbfUssr           = LittleEndian.getInt(data, 0x37a + offset);
-        field_239_lcbSttbfUssr          = LittleEndian.getInt(data, 0x37e + offset);
-
-    }
-
-    public void serialize(byte[] data, int offset)
-    {
-        LittleEndian.putShort(data, 0x0 + offset, (short)field_1_wIdent);
-        LittleEndian.putShort(data, 0x2 + offset, (short)field_2_nFib);
-        LittleEndian.putShort(data, 0x4 + offset, (short)field_3_nProduct);
-        LittleEndian.putShort(data, 0x6 + offset, (short)field_4_lid);
-        LittleEndian.putShort(data, 0x8 + offset, (short)field_5_pnNext);
-        LittleEndian.putShort(data, 0xa + offset, field_6_options);
-        LittleEndian.putShort(data, 0xc + offset, (short)field_7_nFibBack);
-        LittleEndian.putShort(data, 0xe + offset, (short)field_8_lKey);
-        LittleEndian.putShort(data, 0x10 + offset, (short)field_9_envr);
-        LittleEndian.putShort(data, 0x12 + offset, field_10_history);
-        LittleEndian.putShort(data, 0x14 + offset, (short)field_11_chs);
-        LittleEndian.putShort(data, 0x16 + offset, (short)field_12_chsTables);
-        LittleEndian.putInt(data, 0x18 + offset, field_13_fcMin);
-        LittleEndian.putInt(data, 0x1c + offset, field_14_fcMac);
-        LittleEndian.putShort(data, 0x20 + offset, (short)field_15_csw);
-        LittleEndian.putShort(data, 0x22 + offset, (short)field_16_wMagicCreated);
-        LittleEndian.putShort(data, 0x24 + offset, (short)field_17_wMagicRevised);
-        LittleEndian.putShort(data, 0x26 + offset, (short)field_18_wMagicCreatedPrivate);
-        LittleEndian.putShort(data, 0x28 + offset, (short)field_19_wMagicRevisedPrivate);
-        LittleEndian.putShort(data, 0x2a + offset, (short)field_20_pnFbpChpFirst_W6);
-        LittleEndian.putShort(data, 0x2c + offset, (short)field_21_pnChpFirst_W6);
-        LittleEndian.putShort(data, 0x2e + offset, (short)field_22_cpnBteChp_W6);
-        LittleEndian.putShort(data, 0x30 + offset, (short)field_23_pnFbpPapFirst_W6);
-        LittleEndian.putShort(data, 0x32 + offset, (short)field_24_pnPapFirst_W6);
-        LittleEndian.putShort(data, 0x34 + offset, (short)field_25_cpnBtePap_W6);
-        LittleEndian.putShort(data, 0x36 + offset, (short)field_26_pnFbpLvcFirst_W6);
-        LittleEndian.putShort(data, 0x38 + offset, (short)field_27_pnLvcFirst_W6);
-        LittleEndian.putShort(data, 0x3a + offset, (short)field_28_cpnBteLvc_W6);
-        LittleEndian.putShort(data, 0x3c + offset, (short)field_29_lidFE);
-        LittleEndian.putShort(data, 0x3e + offset, (short)field_30_clw);
-        LittleEndian.putInt(data, 0x40 + offset, field_31_cbMac);
-        LittleEndian.putInt(data, 0x44 + offset, field_32_lProductCreated);
-        LittleEndian.putInt(data, 0x48 + offset, field_33_lProductRevised);
-        LittleEndian.putInt(data, 0x4c + offset, field_34_ccpText);
-        LittleEndian.putInt(data, 0x50 + offset, field_35_ccpFtn);
-        LittleEndian.putInt(data, 0x54 + offset, field_36_ccpHdd);
-        LittleEndian.putInt(data, 0x58 + offset, field_37_ccpMcr);
-        LittleEndian.putInt(data, 0x5c + offset, field_38_ccpAtn);
-        LittleEndian.putInt(data, 0x60 + offset, field_39_ccpEdn);
-        LittleEndian.putInt(data, 0x64 + offset, field_40_ccpTxbx);
-        LittleEndian.putInt(data, 0x68 + offset, field_41_ccpHdrTxbx);
-        LittleEndian.putInt(data, 0x6c + offset, field_42_pnFbpChpFirst);
-        LittleEndian.putInt(data, 0x70 + offset, field_43_pnChpFirst);
-        LittleEndian.putInt(data, 0x74 + offset, field_44_cpnBteChp);
-        LittleEndian.putInt(data, 0x78 + offset, field_45_pnFbpPapFirst);
-        LittleEndian.putInt(data, 0x7c + offset, field_46_pnPapFirst);
-        LittleEndian.putInt(data, 0x80 + offset, field_47_cpnBtePap);
-        LittleEndian.putInt(data, 0x84 + offset, field_48_pnFbpLvcFirst);
-        LittleEndian.putInt(data, 0x88 + offset, field_49_pnLvcFirst);
-        LittleEndian.putInt(data, 0x8c + offset, field_50_cpnBteLvc);
-        LittleEndian.putInt(data, 0x90 + offset, field_51_fcIslandFirst);
-        LittleEndian.putInt(data, 0x94 + offset, field_52_fcIslandLim);
-        LittleEndian.putShort(data, 0x98 + offset, (short)field_53_cfclcb);
-        LittleEndian.putInt(data, 0x9a + offset, field_54_fcStshfOrig);
-        LittleEndian.putInt(data, 0x9e + offset, field_55_lcbStshfOrig);
-        LittleEndian.putInt(data, 0xa2 + offset, field_56_fcStshf);
-        LittleEndian.putInt(data, 0xa6 + offset, field_57_lcbStshf);
-        LittleEndian.putInt(data, 0xaa + offset, field_58_fcPlcffndRef);
-        LittleEndian.putInt(data, 0xae + offset, field_59_lcbPlcffndRef);
-        LittleEndian.putInt(data, 0xb2 + offset, field_60_fcPlcffndTxt);
-        LittleEndian.putInt(data, 0xb6 + offset, field_61_lcbPlcffndTxt);
-        LittleEndian.putInt(data, 0xba + offset, field_62_fcPlcfandRef);
-        LittleEndian.putInt(data, 0xbe + offset, field_63_lcbPlcfandRef);
-        LittleEndian.putInt(data, 0xc2 + offset, field_64_fcPlcfandTxt);
-        LittleEndian.putInt(data, 0xc6 + offset, field_65_lcbPlcfandTxt);
-        LittleEndian.putInt(data, 0xca + offset, field_66_fcPlcfsed);
-        LittleEndian.putInt(data, 0xce + offset, field_67_lcbPlcfsed);
-        LittleEndian.putInt(data, 0xd2 + offset, field_68_fcPlcpad);
-        LittleEndian.putInt(data, 0xd6 + offset, field_69_lcbPlcpad);
-        LittleEndian.putInt(data, 0xda + offset, field_70_fcPlcfphe);
-        LittleEndian.putInt(data, 0xde + offset, field_71_lcbPlcfphe);
-        LittleEndian.putInt(data, 0xe2 + offset, field_72_fcSttbfglsy);
-        LittleEndian.putInt(data, 0xe6 + offset, field_73_lcbSttbfglsy);
-        LittleEndian.putInt(data, 0xea + offset, field_74_fcPlcfglsy);
-        LittleEndian.putInt(data, 0xee + offset, field_75_lcbPlcfglsy);
-        LittleEndian.putInt(data, 0xf2 + offset, field_76_fcPlcfhdd);
-        LittleEndian.putInt(data, 0xf6 + offset, field_77_lcbPlcfhdd);
-        LittleEndian.putInt(data, 0xfa + offset, field_78_fcPlcfbteChpx);
-        LittleEndian.putInt(data, 0xfe + offset, field_79_lcbPlcfbteChpx);
-        LittleEndian.putInt(data, 0x102 + offset, field_80_fcPlcfbtePapx);
-        LittleEndian.putInt(data, 0x106 + offset, field_81_lcbPlcfbtePapx);
-        LittleEndian.putInt(data, 0x10a + offset, field_82_fcPlcfsea);
-        LittleEndian.putInt(data, 0x10e + offset, field_83_lcbPlcfsea);
-        LittleEndian.putInt(data, 0x112 + offset, field_84_fcSttbfffn);
-        LittleEndian.putInt(data, 0x116 + offset, field_85_lcbSttbfffn);
-        LittleEndian.putInt(data, 0x11a + offset, field_86_fcPlcffldMom);
-        LittleEndian.putInt(data, 0x11e + offset, field_87_lcbPlcffldMom);
-        LittleEndian.putInt(data, 0x122 + offset, field_88_fcPlcffldHdr);
-        LittleEndian.putInt(data, 0x126 + offset, field_89_lcbPlcffldHdr);
-        LittleEndian.putInt(data, 0x12a + offset, field_90_fcPlcffldFtn);
-        LittleEndian.putInt(data, 0x12e + offset, field_91_lcbPlcffldFtn);
-        LittleEndian.putInt(data, 0x132 + offset, field_92_fcPlcffldAtn);
-        LittleEndian.putInt(data, 0x136 + offset, field_93_lcbPlcffldAtn);
-        LittleEndian.putInt(data, 0x13a + offset, field_94_fcPlcffldMcr);
-        LittleEndian.putInt(data, 0x13e + offset, field_95_lcbPlcffldMcr);
-        LittleEndian.putInt(data, 0x142 + offset, field_96_fcSttbfbkmk);
-        LittleEndian.putInt(data, 0x146 + offset, field_97_lcbSttbfbkmk);
-        LittleEndian.putInt(data, 0x14a + offset, field_98_fcPlcfbkf);
-        LittleEndian.putInt(data, 0x14e + offset, field_99_lcbPlcfbkf);
-        LittleEndian.putInt(data, 0x152 + offset, field_100_fcPlcfbkl);
-        LittleEndian.putInt(data, 0x156 + offset, field_101_lcbPlcfbkl);
-        LittleEndian.putInt(data, 0x15a + offset, field_102_fcCmds);
-        LittleEndian.putInt(data, 0x15e + offset, field_103_lcbCmds);
-        LittleEndian.putInt(data, 0x162 + offset, field_104_fcPlcmcr);
-        LittleEndian.putInt(data, 0x166 + offset, field_105_lcbPlcmcr);
-        LittleEndian.putInt(data, 0x16a + offset, field_106_fcSttbfmcr);
-        LittleEndian.putInt(data, 0x16e + offset, field_107_lcbSttbfmcr);
-        LittleEndian.putInt(data, 0x172 + offset, field_108_fcPrDrvr);
-        LittleEndian.putInt(data, 0x176 + offset, field_109_lcbPrDrvr);
-        LittleEndian.putInt(data, 0x17a + offset, field_110_fcPrEnvPort);
-        LittleEndian.putInt(data, 0x17e + offset, field_111_lcbPrEnvPort);
-        LittleEndian.putInt(data, 0x182 + offset, field_112_fcPrEnvLand);
-        LittleEndian.putInt(data, 0x186 + offset, field_113_lcbPrEnvLand);
-        LittleEndian.putInt(data, 0x18a + offset, field_114_fcWss);
-        LittleEndian.putInt(data, 0x18e + offset, field_115_lcbWss);
-        LittleEndian.putInt(data, 0x192 + offset, field_116_fcDop);
-        LittleEndian.putInt(data, 0x196 + offset, field_117_lcbDop);
-        LittleEndian.putInt(data, 0x19a + offset, field_118_fcSttbfAssoc);
-        LittleEndian.putInt(data, 0x19e + offset, field_119_lcbSttbfAssoc);
-        LittleEndian.putInt(data, 0x1a2 + offset, field_120_fcClx);
-        LittleEndian.putInt(data, 0x1a6 + offset, field_121_lcbClx);
-        LittleEndian.putInt(data, 0x1aa + offset, field_122_fcPlcfpgdFtn);
-        LittleEndian.putInt(data, 0x1ae + offset, field_123_lcbPlcfpgdFtn);
-        LittleEndian.putInt(data, 0x1b2 + offset, field_124_fcAutosaveSource);
-        LittleEndian.putInt(data, 0x1b6 + offset, field_125_lcbAutosaveSource);
-        LittleEndian.putInt(data, 0x1ba + offset, field_126_fcGrpXstAtnOwners);
-        LittleEndian.putInt(data, 0x1be + offset, field_127_lcbGrpXstAtnOwners);
-        LittleEndian.putInt(data, 0x1c2 + offset, field_128_fcSttbfAtnbkmk);
-        LittleEndian.putInt(data, 0x1c6 + offset, field_129_lcbSttbfAtnbkmk);
-        LittleEndian.putInt(data, 0x1ca + offset, field_130_fcPlcdoaMom);
-        LittleEndian.putInt(data, 0x1ce + offset, field_131_lcbPlcdoaMom);
-        LittleEndian.putInt(data, 0x1d2 + offset, field_132_fcPlcdoaHdr);
-        LittleEndian.putInt(data, 0x1d6 + offset, field_133_lcbPlcdoaHdr);
-        LittleEndian.putInt(data, 0x1da + offset, field_134_fcPlcspaMom);
-        LittleEndian.putInt(data, 0x1de + offset, field_135_lcbPlcspaMom);
-        LittleEndian.putInt(data, 0x1e2 + offset, field_136_fcPlcspaHdr);
-        LittleEndian.putInt(data, 0x1e6 + offset, field_137_lcbPlcspaHdr);
-        LittleEndian.putInt(data, 0x1ea + offset, field_138_fcPlcfAtnbkf);
-        LittleEndian.putInt(data, 0x1ee + offset, field_139_lcbPlcfAtnbkf);
-        LittleEndian.putInt(data, 0x1f2 + offset, field_140_fcPlcfAtnbkl);
-        LittleEndian.putInt(data, 0x1f6 + offset, field_141_lcbPlcfAtnbkl);
-        LittleEndian.putInt(data, 0x1fa + offset, field_142_fcPms);
-        LittleEndian.putInt(data, 0x1fe + offset, field_143_lcbPms);
-        LittleEndian.putInt(data, 0x202 + offset, field_144_fcFormFldSttbs);
-        LittleEndian.putInt(data, 0x206 + offset, field_145_lcbFormFldSttbs);
-        LittleEndian.putInt(data, 0x20a + offset, field_146_fcPlcfendRef);
-        LittleEndian.putInt(data, 0x20e + offset, field_147_lcbPlcfendRef);
-        LittleEndian.putInt(data, 0x212 + offset, field_148_fcPlcfendTxt);
-        LittleEndian.putInt(data, 0x216 + offset, field_149_lcbPlcfendTxt);
-        LittleEndian.putInt(data, 0x21a + offset, field_150_fcPlcffldEdn);
-        LittleEndian.putInt(data, 0x21e + offset, field_151_lcbPlcffldEdn);
-        LittleEndian.putInt(data, 0x222 + offset, field_152_fcPlcfpgdEdn);
-        LittleEndian.putInt(data, 0x226 + offset, field_153_lcbPlcfpgdEdn);
-        LittleEndian.putInt(data, 0x22a + offset, field_154_fcDggInfo);
-        LittleEndian.putInt(data, 0x22e + offset, field_155_lcbDggInfo);
-        LittleEndian.putInt(data, 0x232 + offset, field_156_fcSttbfRMark);
-        LittleEndian.putInt(data, 0x236 + offset, field_157_lcbSttbfRMark);
-        LittleEndian.putInt(data, 0x23a + offset, field_158_fcSttbCaption);
-        LittleEndian.putInt(data, 0x23e + offset, field_159_lcbSttbCaption);
-        LittleEndian.putInt(data, 0x242 + offset, field_160_fcSttbAutoCaption);
-        LittleEndian.putInt(data, 0x246 + offset, field_161_lcbSttbAutoCaption);
-        LittleEndian.putInt(data, 0x24a + offset, field_162_fcPlcfwkb);
-        LittleEndian.putInt(data, 0x24e + offset, field_163_lcbPlcfwkb);
-        LittleEndian.putInt(data, 0x252 + offset, field_164_fcPlcfspl);
-        LittleEndian.putInt(data, 0x256 + offset, field_165_lcbPlcfspl);
-        LittleEndian.putInt(data, 0x25a + offset, field_166_fcPlcftxbxTxt);
-        LittleEndian.putInt(data, 0x25e + offset, field_167_lcbPlcftxbxTxt);
-        LittleEndian.putInt(data, 0x262 + offset, field_168_fcPlcffldTxbx);
-        LittleEndian.putInt(data, 0x266 + offset, field_169_lcbPlcffldTxbx);
-        LittleEndian.putInt(data, 0x26a + offset, field_170_fcPlcfhdrtxbxTxt);
-        LittleEndian.putInt(data, 0x26e + offset, field_171_lcbPlcfhdrtxbxTxt);
-        LittleEndian.putInt(data, 0x272 + offset, field_172_fcPlcffldHdrTxbx);
-        LittleEndian.putInt(data, 0x276 + offset, field_173_lcbPlcffldHdrTxbx);
-        LittleEndian.putInt(data, 0x27a + offset, field_174_fcStwUser);
-        LittleEndian.putInt(data, 0x27e + offset, field_175_lcbStwUser);
-        LittleEndian.putInt(data, 0x282 + offset, field_176_fcSttbttmbd);
-        LittleEndian.putInt(data, 0x286 + offset, field_177_cbSttbttmbd);
-        LittleEndian.putInt(data, 0x28a + offset, field_178_fcUnused);
-        LittleEndian.putInt(data, 0x28e + offset, field_179_lcbUnused);
-        LittleEndian.putInt(data, 0x292 + offset, field_180_fcPgdMother);
-        LittleEndian.putInt(data, 0x296 + offset, field_181_lcbPgdMother);
-        LittleEndian.putInt(data, 0x29a + offset, field_182_fcBkdMother);
-        LittleEndian.putInt(data, 0x29e + offset, field_183_lcbBkdMother);
-        LittleEndian.putInt(data, 0x2a2 + offset, field_184_fcPgdFtn);
-        LittleEndian.putInt(data, 0x2a6 + offset, field_185_lcbPgdFtn);
-        LittleEndian.putInt(data, 0x2aa + offset, field_186_fcBkdFtn);
-        LittleEndian.putInt(data, 0x2ae + offset, field_187_lcbBkdFtn);
-        LittleEndian.putInt(data, 0x2b2 + offset, field_188_fcPgdEdn);
-        LittleEndian.putInt(data, 0x2b6 + offset, field_189_lcbPgdEdn);
-        LittleEndian.putInt(data, 0x2ba + offset, field_190_fcBkdEdn);
-        LittleEndian.putInt(data, 0x2be + offset, field_191_lcbBkdEdn);
-        LittleEndian.putInt(data, 0x2c2 + offset, field_192_fcSttbfIntlFld);
-        LittleEndian.putInt(data, 0x2c6 + offset, field_193_lcbSttbfIntlFld);
-        LittleEndian.putInt(data, 0x2ca + offset, field_194_fcRouteSlip);
-        LittleEndian.putInt(data, 0x2ce + offset, field_195_lcbRouteSlip);
-        LittleEndian.putInt(data, 0x2d2 + offset, field_196_fcSttbSavedBy);
-        LittleEndian.putInt(data, 0x2d6 + offset, field_197_lcbSttbSavedBy);
-        LittleEndian.putInt(data, 0x2da + offset, field_198_fcSttbFnm);
-        LittleEndian.putInt(data, 0x2de + offset, field_199_lcbSttbFnm);
-        LittleEndian.putInt(data, 0x2e2 + offset, field_200_fcPlcfLst);
-        LittleEndian.putInt(data, 0x2e6 + offset, field_201_lcbPlcfLst);
-        LittleEndian.putInt(data, 0x2ea + offset, field_202_fcPlfLfo);
-        LittleEndian.putInt(data, 0x2ee + offset, field_203_lcbPlfLfo);
-        LittleEndian.putInt(data, 0x2f2 + offset, field_204_fcPlcftxbxBkd);
-        LittleEndian.putInt(data, 0x2f6 + offset, field_205_lcbPlcftxbxBkd);
-        LittleEndian.putInt(data, 0x2fa + offset, field_206_fcPlcftxbxHdrBkd);
-        LittleEndian.putInt(data, 0x2fe + offset, field_207_lcbPlcftxbxHdrBkd);
-        LittleEndian.putInt(data, 0x302 + offset, field_208_fcDocUndo);
-        LittleEndian.putInt(data, 0x306 + offset, field_209_lcbDocUndo);
-        LittleEndian.putInt(data, 0x30a + offset, field_210_fcRgbuse);
-        LittleEndian.putInt(data, 0x30e + offset, field_211_lcbRgbuse);
-        LittleEndian.putInt(data, 0x312 + offset, field_212_fcUsp);
-        LittleEndian.putInt(data, 0x316 + offset, field_213_lcbUsp);
-        LittleEndian.putInt(data, 0x31a + offset, field_214_fcUskf);
-        LittleEndian.putInt(data, 0x31e + offset, field_215_lcbUskf);
-        LittleEndian.putInt(data, 0x322 + offset, field_216_fcPlcupcRgbuse);
-        LittleEndian.putInt(data, 0x326 + offset, field_217_lcbPlcupcRgbuse);
-        LittleEndian.putInt(data, 0x32a + offset, field_218_fcPlcupcUsp);
-        LittleEndian.putInt(data, 0x32e + offset, field_219_lcbPlcupcUsp);
-        LittleEndian.putInt(data, 0x332 + offset, field_220_fcSttbGlsyStyle);
-        LittleEndian.putInt(data, 0x336 + offset, field_221_lcbSttbGlsyStyle);
-        LittleEndian.putInt(data, 0x33a + offset, field_222_fcPlgosl);
-        LittleEndian.putInt(data, 0x33e + offset, field_223_lcbPlgosl);
-        LittleEndian.putInt(data, 0x342 + offset, field_224_fcPlcocx);
-        LittleEndian.putInt(data, 0x346 + offset, field_225_lcbPlcocx);
-        LittleEndian.putInt(data, 0x34a + offset, field_226_fcPlcfbteLvc);
-        LittleEndian.putInt(data, 0x34e + offset, field_227_lcbPlcfbteLvc);
-        LittleEndian.putInt(data, 0x352 + offset, field_228_dwLowDateTime);
-        LittleEndian.putInt(data, 0x356 + offset, field_229_dwHighDateTime);
-        LittleEndian.putInt(data, 0x35a + offset, field_230_fcPlcflvc);
-        LittleEndian.putInt(data, 0x35e + offset, field_231_lcbPlcflvc);
-        LittleEndian.putInt(data, 0x362 + offset, field_232_fcPlcasumy);
-        LittleEndian.putInt(data, 0x366 + offset, field_233_lcbPlcasumy);
-        LittleEndian.putInt(data, 0x36a + offset, field_234_fcPlcfgram);
-        LittleEndian.putInt(data, 0x36e + offset, field_235_lcbPlcfgram);
-        LittleEndian.putInt(data, 0x372 + offset, field_236_fcSttbListNames);
-        LittleEndian.putInt(data, 0x376 + offset, field_237_lcbSttbListNames);
-        LittleEndian.putInt(data, 0x37a + offset, field_238_fcSttbfUssr);
-        LittleEndian.putInt(data, 0x37e + offset, field_239_lcbSttbfUssr);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FIB]\n");
-
-        buffer.append("    .wIdent               = ");
-        buffer.append(HexDump.intToHex(getWIdent()));
-        buffer.append(" (").append(getWIdent()).append(" )\n");
-
-        buffer.append("    .nFib                 = ");
-        buffer.append(HexDump.intToHex(getNFib()));
-        buffer.append(" (").append(getNFib()).append(" )\n");
-
-        buffer.append("    .nProduct             = ");
-        buffer.append(HexDump.intToHex(getNProduct()));
-        buffer.append(" (").append(getNProduct()).append(" )\n");
-
-        buffer.append("    .lid                  = ");
-        buffer.append(HexDump.intToHex(getLid()));
-        buffer.append(" (").append(getLid()).append(" )\n");
-
-        buffer.append("    .pnNext               = ");
-        buffer.append(HexDump.intToHex(getPnNext()));
-        buffer.append(" (").append(getPnNext()).append(" )\n");
-
-        buffer.append("    .options              = ");
-        buffer.append(HexDump.shortToHex(getOptions()));
-        buffer.append(" (").append(getOptions()).append(" )\n");
-        buffer.append("         .fDot                     = ").append(isFDot()).append('\n');
-        buffer.append("         .fGlsy                    = ").append(isFGlsy()).append('\n');
-        buffer.append("         .fComplex                 = ").append(isFComplex()).append('\n');
-        buffer.append("         .fHasPic                  = ").append(isFHasPic()).append('\n');
-        buffer.append("         .cQuickSaves              = ").append(getCQuickSaves()).append('\n');
-        buffer.append("         .fEncrypted               = ").append(isFEncrypted()).append('\n');
-        buffer.append("         .fWhichTblStm             = ").append(isFWhichTblStm()).append('\n');
-        buffer.append("         .fReadOnlyRecommended     = ").append(isFReadOnlyRecommended()).append('\n');
-        buffer.append("         .fWriteReservation        = ").append(isFWriteReservation()).append('\n');
-        buffer.append("         .fExtChar                 = ").append(isFExtChar()).append('\n');
-        buffer.append("         .fLoadOverride            = ").append(isFLoadOverride()).append('\n');
-        buffer.append("         .fFarEast                 = ").append(isFFarEast()).append('\n');
-        buffer.append("         .fCrypto                  = ").append(isFCrypto()).append('\n');
-
-        buffer.append("    .nFibBack             = ");
-        buffer.append(HexDump.intToHex(getNFibBack()));
-        buffer.append(" (").append(getNFibBack()).append(" )\n");
-
-        buffer.append("    .lKey                 = ");
-        buffer.append(HexDump.intToHex(getLKey()));
-        buffer.append(" (").append(getLKey()).append(" )\n");
-
-        buffer.append("    .envr                 = ");
-        buffer.append(HexDump.intToHex(getEnvr()));
-        buffer.append(" (").append(getEnvr()).append(" )\n");
-
-        buffer.append("    .history              = ");
-        buffer.append(HexDump.shortToHex(getHistory()));
-        buffer.append(" (").append(getHistory()).append(" )\n");
-        buffer.append("         .fMac                     = ").append(isFMac()).append('\n');
-        buffer.append("         .fEmptySpecial            = ").append(isFEmptySpecial()).append('\n');
-        buffer.append("         .fLoadOverridePage        = ").append(isFLoadOverridePage()).append('\n');
-        buffer.append("         .fFutureSavedUndo         = ").append(isFFutureSavedUndo()).append('\n');
-        buffer.append("         .fWord97Saved             = ").append(isFWord97Saved()).append('\n');
-        buffer.append("         .fSpare0                  = ").append(getFSpare0()).append('\n');
-
-        buffer.append("    .chs                  = ");
-        buffer.append(HexDump.intToHex(getChs()));
-        buffer.append(" (").append(getChs()).append(" )\n");
-
-        buffer.append("    .chsTables            = ");
-        buffer.append(HexDump.intToHex(getChsTables()));
-        buffer.append(" (").append(getChsTables()).append(" )\n");
-
-        buffer.append("    .fcMin                = ");
-        buffer.append(HexDump.intToHex(getFcMin()));
-        buffer.append(" (").append(getFcMin()).append(" )\n");
-
-        buffer.append("    .fcMac                = ");
-        buffer.append(HexDump.intToHex(getFcMac()));
-        buffer.append(" (").append(getFcMac()).append(" )\n");
-
-        buffer.append("    .csw                  = ");
-        buffer.append(HexDump.intToHex(getCsw()));
-        buffer.append(" (").append(getCsw()).append(" )\n");
-
-        buffer.append("    .wMagicCreated        = ");
-        buffer.append(HexDump.intToHex(getWMagicCreated()));
-        buffer.append(" (").append(getWMagicCreated()).append(" )\n");
-
-        buffer.append("    .wMagicRevised        = ");
-        buffer.append(HexDump.intToHex(getWMagicRevised()));
-        buffer.append(" (").append(getWMagicRevised()).append(" )\n");
-
-        buffer.append("    .wMagicCreatedPrivate = ");
-        buffer.append(HexDump.intToHex(getWMagicCreatedPrivate()));
-        buffer.append(" (").append(getWMagicCreatedPrivate()).append(" )\n");
-
-        buffer.append("    .wMagicRevisedPrivate = ");
-        buffer.append(HexDump.intToHex(getWMagicRevisedPrivate()));
-        buffer.append(" (").append(getWMagicRevisedPrivate()).append(" )\n");
-
-        buffer.append("    .pnFbpChpFirst_W6     = ");
-        buffer.append(HexDump.intToHex(getPnFbpChpFirst_W6()));
-        buffer.append(" (").append(getPnFbpChpFirst_W6()).append(" )\n");
-
-        buffer.append("    .pnChpFirst_W6        = ");
-        buffer.append(HexDump.intToHex(getPnChpFirst_W6()));
-        buffer.append(" (").append(getPnChpFirst_W6()).append(" )\n");
-
-        buffer.append("    .cpnBteChp_W6         = ");
-        buffer.append(HexDump.intToHex(getCpnBteChp_W6()));
-        buffer.append(" (").append(getCpnBteChp_W6()).append(" )\n");
-
-        buffer.append("    .pnFbpPapFirst_W6     = ");
-        buffer.append(HexDump.intToHex(getPnFbpPapFirst_W6()));
-        buffer.append(" (").append(getPnFbpPapFirst_W6()).append(" )\n");
-
-        buffer.append("    .pnPapFirst_W6        = ");
-        buffer.append(HexDump.intToHex(getPnPapFirst_W6()));
-        buffer.append(" (").append(getPnPapFirst_W6()).append(" )\n");
-
-        buffer.append("    .cpnBtePap_W6         = ");
-        buffer.append(HexDump.intToHex(getCpnBtePap_W6()));
-        buffer.append(" (").append(getCpnBtePap_W6()).append(" )\n");
-
-        buffer.append("    .pnFbpLvcFirst_W6     = ");
-        buffer.append(HexDump.intToHex(getPnFbpLvcFirst_W6()));
-        buffer.append(" (").append(getPnFbpLvcFirst_W6()).append(" )\n");
-
-        buffer.append("    .pnLvcFirst_W6        = ");
-        buffer.append(HexDump.intToHex(getPnLvcFirst_W6()));
-        buffer.append(" (").append(getPnLvcFirst_W6()).append(" )\n");
-
-        buffer.append("    .cpnBteLvc_W6         = ");
-        buffer.append(HexDump.intToHex(getCpnBteLvc_W6()));
-        buffer.append(" (").append(getCpnBteLvc_W6()).append(" )\n");
-
-        buffer.append("    .lidFE                = ");
-        buffer.append(HexDump.intToHex(getLidFE()));
-        buffer.append(" (").append(getLidFE()).append(" )\n");
-
-        buffer.append("    .clw                  = ");
-        buffer.append(HexDump.intToHex(getClw()));
-        buffer.append(" (").append(getClw()).append(" )\n");
-
-        buffer.append("    .cbMac                = ");
-        buffer.append(HexDump.intToHex(getCbMac()));
-        buffer.append(" (").append(getCbMac()).append(" )\n");
-
-        buffer.append("    .lProductCreated      = ");
-        buffer.append(HexDump.intToHex(getLProductCreated()));
-        buffer.append(" (").append(getLProductCreated()).append(" )\n");
-
-        buffer.append("    .lProductRevised      = ");
-        buffer.append(HexDump.intToHex(getLProductRevised()));
-        buffer.append(" (").append(getLProductRevised()).append(" )\n");
-
-        buffer.append("    .ccpText              = ");
-        buffer.append(HexDump.intToHex(getCcpText()));
-        buffer.append(" (").append(getCcpText()).append(" )\n");
-
-        buffer.append("    .ccpFtn               = ");
-        buffer.append(HexDump.intToHex(getCcpFtn()));
-        buffer.append(" (").append(getCcpFtn()).append(" )\n");
-
-        buffer.append("    .ccpHdd               = ");
-        buffer.append(HexDump.intToHex(getCcpHdd()));
-        buffer.append(" (").append(getCcpHdd()).append(" )\n");
-
-        buffer.append("    .ccpMcr               = ");
-        buffer.append(HexDump.intToHex(getCcpMcr()));
-        buffer.append(" (").append(getCcpMcr()).append(" )\n");
-
-        buffer.append("    .ccpAtn               = ");
-        buffer.append(HexDump.intToHex(getCcpAtn()));
-        buffer.append(" (").append(getCcpAtn()).append(" )\n");
-
-        buffer.append("    .ccpEdn               = ");
-        buffer.append(HexDump.intToHex(getCcpEdn()));
-        buffer.append(" (").append(getCcpEdn()).append(" )\n");
-
-        buffer.append("    .ccpTxbx              = ");
-        buffer.append(HexDump.intToHex(getCcpTxbx()));
-        buffer.append(" (").append(getCcpTxbx()).append(" )\n");
-
-        buffer.append("    .ccpHdrTxbx           = ");
-        buffer.append(HexDump.intToHex(getCcpHdrTxbx()));
-        buffer.append(" (").append(getCcpHdrTxbx()).append(" )\n");
-
-        buffer.append("    .pnFbpChpFirst        = ");
-        buffer.append(HexDump.intToHex(getPnFbpChpFirst()));
-        buffer.append(" (").append(getPnFbpChpFirst()).append(" )\n");
-
-        buffer.append("    .pnChpFirst           = ");
-        buffer.append(HexDump.intToHex(getPnChpFirst()));
-        buffer.append(" (").append(getPnChpFirst()).append(" )\n");
-
-        buffer.append("    .cpnBteChp            = ");
-        buffer.append(HexDump.intToHex(getCpnBteChp()));
-        buffer.append(" (").append(getCpnBteChp()).append(" )\n");
-
-        buffer.append("    .pnFbpPapFirst        = ");
-        buffer.append(HexDump.intToHex(getPnFbpPapFirst()));
-        buffer.append(" (").append(getPnFbpPapFirst()).append(" )\n");
-
-        buffer.append("    .pnPapFirst           = ");
-        buffer.append(HexDump.intToHex(getPnPapFirst()));
-        buffer.append(" (").append(getPnPapFirst()).append(" )\n");
-
-        buffer.append("    .cpnBtePap            = ");
-        buffer.append(HexDump.intToHex(getCpnBtePap()));
-        buffer.append(" (").append(getCpnBtePap()).append(" )\n");
-
-        buffer.append("    .pnFbpLvcFirst        = ");
-        buffer.append(HexDump.intToHex(getPnFbpLvcFirst()));
-        buffer.append(" (").append(getPnFbpLvcFirst()).append(" )\n");
-
-        buffer.append("    .pnLvcFirst           = ");
-        buffer.append(HexDump.intToHex(getPnLvcFirst()));
-        buffer.append(" (").append(getPnLvcFirst()).append(" )\n");
-
-        buffer.append("    .cpnBteLvc            = ");
-        buffer.append(HexDump.intToHex(getCpnBteLvc()));
-        buffer.append(" (").append(getCpnBteLvc()).append(" )\n");
-
-        buffer.append("    .fcIslandFirst        = ");
-        buffer.append(HexDump.intToHex(getFcIslandFirst()));
-        buffer.append(" (").append(getFcIslandFirst()).append(" )\n");
-
-        buffer.append("    .fcIslandLim          = ");
-        buffer.append(HexDump.intToHex(getFcIslandLim()));
-        buffer.append(" (").append(getFcIslandLim()).append(" )\n");
-
-        buffer.append("    .cfclcb               = ");
-        buffer.append(HexDump.intToHex(getCfclcb()));
-        buffer.append(" (").append(getCfclcb()).append(" )\n");
-
-        buffer.append("    .fcStshfOrig          = ");
-        buffer.append(HexDump.intToHex(getFcStshfOrig()));
-        buffer.append(" (").append(getFcStshfOrig()).append(" )\n");
-
-        buffer.append("    .lcbStshfOrig         = ");
-        buffer.append(HexDump.intToHex(getLcbStshfOrig()));
-        buffer.append(" (").append(getLcbStshfOrig()).append(" )\n");
-
-        buffer.append("    .fcStshf              = ");
-        buffer.append(HexDump.intToHex(getFcStshf()));
-        buffer.append(" (").append(getFcStshf()).append(" )\n");
-
-        buffer.append("    .lcbStshf             = ");
-        buffer.append(HexDump.intToHex(getLcbStshf()));
-        buffer.append(" (").append(getLcbStshf()).append(" )\n");
-
-        buffer.append("    .fcPlcffndRef         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffndRef()));
-        buffer.append(" (").append(getFcPlcffndRef()).append(" )\n");
-
-        buffer.append("    .lcbPlcffndRef        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffndRef()));
-        buffer.append(" (").append(getLcbPlcffndRef()).append(" )\n");
-
-        buffer.append("    .fcPlcffndTxt         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffndTxt()));
-        buffer.append(" (").append(getFcPlcffndTxt()).append(" )\n");
-
-        buffer.append("    .lcbPlcffndTxt        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffndTxt()));
-        buffer.append(" (").append(getLcbPlcffndTxt()).append(" )\n");
-
-        buffer.append("    .fcPlcfandRef         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfandRef()));
-        buffer.append(" (").append(getFcPlcfandRef()).append(" )\n");
-
-        buffer.append("    .lcbPlcfandRef        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfandRef()));
-        buffer.append(" (").append(getLcbPlcfandRef()).append(" )\n");
-
-        buffer.append("    .fcPlcfandTxt         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfandTxt()));
-        buffer.append(" (").append(getFcPlcfandTxt()).append(" )\n");
-
-        buffer.append("    .lcbPlcfandTxt        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfandTxt()));
-        buffer.append(" (").append(getLcbPlcfandTxt()).append(" )\n");
-
-        buffer.append("    .fcPlcfsed            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfsed()));
-        buffer.append(" (").append(getFcPlcfsed()).append(" )\n");
-
-        buffer.append("    .lcbPlcfsed           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfsed()));
-        buffer.append(" (").append(getLcbPlcfsed()).append(" )\n");
-
-        buffer.append("    .fcPlcpad             = ");
-        buffer.append(HexDump.intToHex(getFcPlcpad()));
-        buffer.append(" (").append(getFcPlcpad()).append(" )\n");
-
-        buffer.append("    .lcbPlcpad            = ");
-        buffer.append(HexDump.intToHex(getLcbPlcpad()));
-        buffer.append(" (").append(getLcbPlcpad()).append(" )\n");
-
-        buffer.append("    .fcPlcfphe            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfphe()));
-        buffer.append(" (").append(getFcPlcfphe()).append(" )\n");
-
-        buffer.append("    .lcbPlcfphe           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfphe()));
-        buffer.append(" (").append(getLcbPlcfphe()).append(" )\n");
-
-        buffer.append("    .fcSttbfglsy          = ");
-        buffer.append(HexDump.intToHex(getFcSttbfglsy()));
-        buffer.append(" (").append(getFcSttbfglsy()).append(" )\n");
-
-        buffer.append("    .lcbSttbfglsy         = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfglsy()));
-        buffer.append(" (").append(getLcbSttbfglsy()).append(" )\n");
-
-        buffer.append("    .fcPlcfglsy           = ");
-        buffer.append(HexDump.intToHex(getFcPlcfglsy()));
-        buffer.append(" (").append(getFcPlcfglsy()).append(" )\n");
-
-        buffer.append("    .lcbPlcfglsy          = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfglsy()));
-        buffer.append(" (").append(getLcbPlcfglsy()).append(" )\n");
-
-        buffer.append("    .fcPlcfhdd            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfhdd()));
-        buffer.append(" (").append(getFcPlcfhdd()).append(" )\n");
-
-        buffer.append("    .lcbPlcfhdd           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfhdd()));
-        buffer.append(" (").append(getLcbPlcfhdd()).append(" )\n");
-
-        buffer.append("    .fcPlcfbteChpx        = ");
-        buffer.append(HexDump.intToHex(getFcPlcfbteChpx()));
-        buffer.append(" (").append(getFcPlcfbteChpx()).append(" )\n");
-
-        buffer.append("    .lcbPlcfbteChpx       = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfbteChpx()));
-        buffer.append(" (").append(getLcbPlcfbteChpx()).append(" )\n");
-
-        buffer.append("    .fcPlcfbtePapx        = ");
-        buffer.append(HexDump.intToHex(getFcPlcfbtePapx()));
-        buffer.append(" (").append(getFcPlcfbtePapx()).append(" )\n");
-
-        buffer.append("    .lcbPlcfbtePapx       = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfbtePapx()));
-        buffer.append(" (").append(getLcbPlcfbtePapx()).append(" )\n");
-
-        buffer.append("    .fcPlcfsea            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfsea()));
-        buffer.append(" (").append(getFcPlcfsea()).append(" )\n");
-
-        buffer.append("    .lcbPlcfsea           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfsea()));
-        buffer.append(" (").append(getLcbPlcfsea()).append(" )\n");
-
-        buffer.append("    .fcSttbfffn           = ");
-        buffer.append(HexDump.intToHex(getFcSttbfffn()));
-        buffer.append(" (").append(getFcSttbfffn()).append(" )\n");
-
-        buffer.append("    .lcbSttbfffn          = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfffn()));
-        buffer.append(" (").append(getLcbSttbfffn()).append(" )\n");
-
-        buffer.append("    .fcPlcffldMom         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldMom()));
-        buffer.append(" (").append(getFcPlcffldMom()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldMom        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldMom()));
-        buffer.append(" (").append(getLcbPlcffldMom()).append(" )\n");
-
-        buffer.append("    .fcPlcffldHdr         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldHdr()));
-        buffer.append(" (").append(getFcPlcffldHdr()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldHdr        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldHdr()));
-        buffer.append(" (").append(getLcbPlcffldHdr()).append(" )\n");
-
-        buffer.append("    .fcPlcffldFtn         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldFtn()));
-        buffer.append(" (").append(getFcPlcffldFtn()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldFtn        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldFtn()));
-        buffer.append(" (").append(getLcbPlcffldFtn()).append(" )\n");
-
-        buffer.append("    .fcPlcffldAtn         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldAtn()));
-        buffer.append(" (").append(getFcPlcffldAtn()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldAtn        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldAtn()));
-        buffer.append(" (").append(getLcbPlcffldAtn()).append(" )\n");
-
-        buffer.append("    .fcPlcffldMcr         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldMcr()));
-        buffer.append(" (").append(getFcPlcffldMcr()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldMcr        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldMcr()));
-        buffer.append(" (").append(getLcbPlcffldMcr()).append(" )\n");
-
-        buffer.append("    .fcSttbfbkmk          = ");
-        buffer.append(HexDump.intToHex(getFcSttbfbkmk()));
-        buffer.append(" (").append(getFcSttbfbkmk()).append(" )\n");
-
-        buffer.append("    .lcbSttbfbkmk         = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfbkmk()));
-        buffer.append(" (").append(getLcbSttbfbkmk()).append(" )\n");
-
-        buffer.append("    .fcPlcfbkf            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfbkf()));
-        buffer.append(" (").append(getFcPlcfbkf()).append(" )\n");
-
-        buffer.append("    .lcbPlcfbkf           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfbkf()));
-        buffer.append(" (").append(getLcbPlcfbkf()).append(" )\n");
-
-        buffer.append("    .fcPlcfbkl            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfbkl()));
-        buffer.append(" (").append(getFcPlcfbkl()).append(" )\n");
-
-        buffer.append("    .lcbPlcfbkl           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfbkl()));
-        buffer.append(" (").append(getLcbPlcfbkl()).append(" )\n");
-
-        buffer.append("    .fcCmds               = ");
-        buffer.append(HexDump.intToHex(getFcCmds()));
-        buffer.append(" (").append(getFcCmds()).append(" )\n");
-
-        buffer.append("    .lcbCmds              = ");
-        buffer.append(HexDump.intToHex(getLcbCmds()));
-        buffer.append(" (").append(getLcbCmds()).append(" )\n");
-
-        buffer.append("    .fcPlcmcr             = ");
-        buffer.append(HexDump.intToHex(getFcPlcmcr()));
-        buffer.append(" (").append(getFcPlcmcr()).append(" )\n");
-
-        buffer.append("    .lcbPlcmcr            = ");
-        buffer.append(HexDump.intToHex(getLcbPlcmcr()));
-        buffer.append(" (").append(getLcbPlcmcr()).append(" )\n");
-
-        buffer.append("    .fcSttbfmcr           = ");
-        buffer.append(HexDump.intToHex(getFcSttbfmcr()));
-        buffer.append(" (").append(getFcSttbfmcr()).append(" )\n");
-
-        buffer.append("    .lcbSttbfmcr          = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfmcr()));
-        buffer.append(" (").append(getLcbSttbfmcr()).append(" )\n");
-
-        buffer.append("    .fcPrDrvr             = ");
-        buffer.append(HexDump.intToHex(getFcPrDrvr()));
-        buffer.append(" (").append(getFcPrDrvr()).append(" )\n");
-
-        buffer.append("    .lcbPrDrvr            = ");
-        buffer.append(HexDump.intToHex(getLcbPrDrvr()));
-        buffer.append(" (").append(getLcbPrDrvr()).append(" )\n");
-
-        buffer.append("    .fcPrEnvPort          = ");
-        buffer.append(HexDump.intToHex(getFcPrEnvPort()));
-        buffer.append(" (").append(getFcPrEnvPort()).append(" )\n");
-
-        buffer.append("    .lcbPrEnvPort         = ");
-        buffer.append(HexDump.intToHex(getLcbPrEnvPort()));
-        buffer.append(" (").append(getLcbPrEnvPort()).append(" )\n");
-
-        buffer.append("    .fcPrEnvLand          = ");
-        buffer.append(HexDump.intToHex(getFcPrEnvLand()));
-        buffer.append(" (").append(getFcPrEnvLand()).append(" )\n");
-
-        buffer.append("    .lcbPrEnvLand         = ");
-        buffer.append(HexDump.intToHex(getLcbPrEnvLand()));
-        buffer.append(" (").append(getLcbPrEnvLand()).append(" )\n");
-
-        buffer.append("    .fcWss                = ");
-        buffer.append(HexDump.intToHex(getFcWss()));
-        buffer.append(" (").append(getFcWss()).append(" )\n");
-
-        buffer.append("    .lcbWss               = ");
-        buffer.append(HexDump.intToHex(getLcbWss()));
-        buffer.append(" (").append(getLcbWss()).append(" )\n");
-
-        buffer.append("    .fcDop                = ");
-        buffer.append(HexDump.intToHex(getFcDop()));
-        buffer.append(" (").append(getFcDop()).append(" )\n");
-
-        buffer.append("    .lcbDop               = ");
-        buffer.append(HexDump.intToHex(getLcbDop()));
-        buffer.append(" (").append(getLcbDop()).append(" )\n");
-
-        buffer.append("    .fcSttbfAssoc         = ");
-        buffer.append(HexDump.intToHex(getFcSttbfAssoc()));
-        buffer.append(" (").append(getFcSttbfAssoc()).append(" )\n");
-
-        buffer.append("    .lcbSttbfAssoc        = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfAssoc()));
-        buffer.append(" (").append(getLcbSttbfAssoc()).append(" )\n");
-
-        buffer.append("    .fcClx                = ");
-        buffer.append(HexDump.intToHex(getFcClx()));
-        buffer.append(" (").append(getFcClx()).append(" )\n");
-
-        buffer.append("    .lcbClx               = ");
-        buffer.append(HexDump.intToHex(getLcbClx()));
-        buffer.append(" (").append(getLcbClx()).append(" )\n");
-
-        buffer.append("    .fcPlcfpgdFtn         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfpgdFtn()));
-        buffer.append(" (").append(getFcPlcfpgdFtn()).append(" )\n");
-
-        buffer.append("    .lcbPlcfpgdFtn        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfpgdFtn()));
-        buffer.append(" (").append(getLcbPlcfpgdFtn()).append(" )\n");
-
-        buffer.append("    .fcAutosaveSource     = ");
-        buffer.append(HexDump.intToHex(getFcAutosaveSource()));
-        buffer.append(" (").append(getFcAutosaveSource()).append(" )\n");
-
-        buffer.append("    .lcbAutosaveSource    = ");
-        buffer.append(HexDump.intToHex(getLcbAutosaveSource()));
-        buffer.append(" (").append(getLcbAutosaveSource()).append(" )\n");
-
-        buffer.append("    .fcGrpXstAtnOwners    = ");
-        buffer.append(HexDump.intToHex(getFcGrpXstAtnOwners()));
-        buffer.append(" (").append(getFcGrpXstAtnOwners()).append(" )\n");
-
-        buffer.append("    .lcbGrpXstAtnOwners   = ");
-        buffer.append(HexDump.intToHex(getLcbGrpXstAtnOwners()));
-        buffer.append(" (").append(getLcbGrpXstAtnOwners()).append(" )\n");
-
-        buffer.append("    .fcSttbfAtnbkmk       = ");
-        buffer.append(HexDump.intToHex(getFcSttbfAtnbkmk()));
-        buffer.append(" (").append(getFcSttbfAtnbkmk()).append(" )\n");
-
-        buffer.append("    .lcbSttbfAtnbkmk      = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfAtnbkmk()));
-        buffer.append(" (").append(getLcbSttbfAtnbkmk()).append(" )\n");
-
-        buffer.append("    .fcPlcdoaMom          = ");
-        buffer.append(HexDump.intToHex(getFcPlcdoaMom()));
-        buffer.append(" (").append(getFcPlcdoaMom()).append(" )\n");
-
-        buffer.append("    .lcbPlcdoaMom         = ");
-        buffer.append(HexDump.intToHex(getLcbPlcdoaMom()));
-        buffer.append(" (").append(getLcbPlcdoaMom()).append(" )\n");
-
-        buffer.append("    .fcPlcdoaHdr          = ");
-        buffer.append(HexDump.intToHex(getFcPlcdoaHdr()));
-        buffer.append(" (").append(getFcPlcdoaHdr()).append(" )\n");
-
-        buffer.append("    .lcbPlcdoaHdr         = ");
-        buffer.append(HexDump.intToHex(getLcbPlcdoaHdr()));
-        buffer.append(" (").append(getLcbPlcdoaHdr()).append(" )\n");
-
-        buffer.append("    .fcPlcspaMom          = ");
-        buffer.append(HexDump.intToHex(getFcPlcspaMom()));
-        buffer.append(" (").append(getFcPlcspaMom()).append(" )\n");
-
-        buffer.append("    .lcbPlcspaMom         = ");
-        buffer.append(HexDump.intToHex(getLcbPlcspaMom()));
-        buffer.append(" (").append(getLcbPlcspaMom()).append(" )\n");
-
-        buffer.append("    .fcPlcspaHdr          = ");
-        buffer.append(HexDump.intToHex(getFcPlcspaHdr()));
-        buffer.append(" (").append(getFcPlcspaHdr()).append(" )\n");
-
-        buffer.append("    .lcbPlcspaHdr         = ");
-        buffer.append(HexDump.intToHex(getLcbPlcspaHdr()));
-        buffer.append(" (").append(getLcbPlcspaHdr()).append(" )\n");
-
-        buffer.append("    .fcPlcfAtnbkf         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfAtnbkf()));
-        buffer.append(" (").append(getFcPlcfAtnbkf()).append(" )\n");
-
-        buffer.append("    .lcbPlcfAtnbkf        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfAtnbkf()));
-        buffer.append(" (").append(getLcbPlcfAtnbkf()).append(" )\n");
-
-        buffer.append("    .fcPlcfAtnbkl         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfAtnbkl()));
-        buffer.append(" (").append(getFcPlcfAtnbkl()).append(" )\n");
-
-        buffer.append("    .lcbPlcfAtnbkl        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfAtnbkl()));
-        buffer.append(" (").append(getLcbPlcfAtnbkl()).append(" )\n");
-
-        buffer.append("    .fcPms                = ");
-        buffer.append(HexDump.intToHex(getFcPms()));
-        buffer.append(" (").append(getFcPms()).append(" )\n");
-
-        buffer.append("    .lcbPms               = ");
-        buffer.append(HexDump.intToHex(getLcbPms()));
-        buffer.append(" (").append(getLcbPms()).append(" )\n");
-
-        buffer.append("    .fcFormFldSttbs       = ");
-        buffer.append(HexDump.intToHex(getFcFormFldSttbs()));
-        buffer.append(" (").append(getFcFormFldSttbs()).append(" )\n");
-
-        buffer.append("    .lcbFormFldSttbs      = ");
-        buffer.append(HexDump.intToHex(getLcbFormFldSttbs()));
-        buffer.append(" (").append(getLcbFormFldSttbs()).append(" )\n");
-
-        buffer.append("    .fcPlcfendRef         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfendRef()));
-        buffer.append(" (").append(getFcPlcfendRef()).append(" )\n");
-
-        buffer.append("    .lcbPlcfendRef        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfendRef()));
-        buffer.append(" (").append(getLcbPlcfendRef()).append(" )\n");
-
-        buffer.append("    .fcPlcfendTxt         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfendTxt()));
-        buffer.append(" (").append(getFcPlcfendTxt()).append(" )\n");
-
-        buffer.append("    .lcbPlcfendTxt        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfendTxt()));
-        buffer.append(" (").append(getLcbPlcfendTxt()).append(" )\n");
-
-        buffer.append("    .fcPlcffldEdn         = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldEdn()));
-        buffer.append(" (").append(getFcPlcffldEdn()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldEdn        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldEdn()));
-        buffer.append(" (").append(getLcbPlcffldEdn()).append(" )\n");
-
-        buffer.append("    .fcPlcfpgdEdn         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfpgdEdn()));
-        buffer.append(" (").append(getFcPlcfpgdEdn()).append(" )\n");
-
-        buffer.append("    .lcbPlcfpgdEdn        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfpgdEdn()));
-        buffer.append(" (").append(getLcbPlcfpgdEdn()).append(" )\n");
-
-        buffer.append("    .fcDggInfo            = ");
-        buffer.append(HexDump.intToHex(getFcDggInfo()));
-        buffer.append(" (").append(getFcDggInfo()).append(" )\n");
-
-        buffer.append("    .lcbDggInfo           = ");
-        buffer.append(HexDump.intToHex(getLcbDggInfo()));
-        buffer.append(" (").append(getLcbDggInfo()).append(" )\n");
-
-        buffer.append("    .fcSttbfRMark         = ");
-        buffer.append(HexDump.intToHex(getFcSttbfRMark()));
-        buffer.append(" (").append(getFcSttbfRMark()).append(" )\n");
-
-        buffer.append("    .lcbSttbfRMark        = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfRMark()));
-        buffer.append(" (").append(getLcbSttbfRMark()).append(" )\n");
-
-        buffer.append("    .fcSttbCaption        = ");
-        buffer.append(HexDump.intToHex(getFcSttbCaption()));
-        buffer.append(" (").append(getFcSttbCaption()).append(" )\n");
-
-        buffer.append("    .lcbSttbCaption       = ");
-        buffer.append(HexDump.intToHex(getLcbSttbCaption()));
-        buffer.append(" (").append(getLcbSttbCaption()).append(" )\n");
-
-        buffer.append("    .fcSttbAutoCaption    = ");
-        buffer.append(HexDump.intToHex(getFcSttbAutoCaption()));
-        buffer.append(" (").append(getFcSttbAutoCaption()).append(" )\n");
-
-        buffer.append("    .lcbSttbAutoCaption   = ");
-        buffer.append(HexDump.intToHex(getLcbSttbAutoCaption()));
-        buffer.append(" (").append(getLcbSttbAutoCaption()).append(" )\n");
-
-        buffer.append("    .fcPlcfwkb            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfwkb()));
-        buffer.append(" (").append(getFcPlcfwkb()).append(" )\n");
-
-        buffer.append("    .lcbPlcfwkb           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfwkb()));
-        buffer.append(" (").append(getLcbPlcfwkb()).append(" )\n");
-
-        buffer.append("    .fcPlcfspl            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfspl()));
-        buffer.append(" (").append(getFcPlcfspl()).append(" )\n");
-
-        buffer.append("    .lcbPlcfspl           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfspl()));
-        buffer.append(" (").append(getLcbPlcfspl()).append(" )\n");
-
-        buffer.append("    .fcPlcftxbxTxt        = ");
-        buffer.append(HexDump.intToHex(getFcPlcftxbxTxt()));
-        buffer.append(" (").append(getFcPlcftxbxTxt()).append(" )\n");
-
-        buffer.append("    .lcbPlcftxbxTxt       = ");
-        buffer.append(HexDump.intToHex(getLcbPlcftxbxTxt()));
-        buffer.append(" (").append(getLcbPlcftxbxTxt()).append(" )\n");
-
-        buffer.append("    .fcPlcffldTxbx        = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldTxbx()));
-        buffer.append(" (").append(getFcPlcffldTxbx()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldTxbx       = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldTxbx()));
-        buffer.append(" (").append(getLcbPlcffldTxbx()).append(" )\n");
-
-        buffer.append("    .fcPlcfhdrtxbxTxt     = ");
-        buffer.append(HexDump.intToHex(getFcPlcfhdrtxbxTxt()));
-        buffer.append(" (").append(getFcPlcfhdrtxbxTxt()).append(" )\n");
-
-        buffer.append("    .lcbPlcfhdrtxbxTxt    = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfhdrtxbxTxt()));
-        buffer.append(" (").append(getLcbPlcfhdrtxbxTxt()).append(" )\n");
-
-        buffer.append("    .fcPlcffldHdrTxbx     = ");
-        buffer.append(HexDump.intToHex(getFcPlcffldHdrTxbx()));
-        buffer.append(" (").append(getFcPlcffldHdrTxbx()).append(" )\n");
-
-        buffer.append("    .lcbPlcffldHdrTxbx    = ");
-        buffer.append(HexDump.intToHex(getLcbPlcffldHdrTxbx()));
-        buffer.append(" (").append(getLcbPlcffldHdrTxbx()).append(" )\n");
-
-        buffer.append("    .fcStwUser            = ");
-        buffer.append(HexDump.intToHex(getFcStwUser()));
-        buffer.append(" (").append(getFcStwUser()).append(" )\n");
-
-        buffer.append("    .lcbStwUser           = ");
-        buffer.append(HexDump.intToHex(getLcbStwUser()));
-        buffer.append(" (").append(getLcbStwUser()).append(" )\n");
-
-        buffer.append("    .fcSttbttmbd          = ");
-        buffer.append(HexDump.intToHex(getFcSttbttmbd()));
-        buffer.append(" (").append(getFcSttbttmbd()).append(" )\n");
-
-        buffer.append("    .cbSttbttmbd          = ");
-        buffer.append(HexDump.intToHex(getCbSttbttmbd()));
-        buffer.append(" (").append(getCbSttbttmbd()).append(" )\n");
-
-        buffer.append("    .fcUnused             = ");
-        buffer.append(HexDump.intToHex(getFcUnused()));
-        buffer.append(" (").append(getFcUnused()).append(" )\n");
-
-        buffer.append("    .lcbUnused            = ");
-        buffer.append(HexDump.intToHex(getLcbUnused()));
-        buffer.append(" (").append(getLcbUnused()).append(" )\n");
-
-        buffer.append("    .fcPgdMother          = ");
-        buffer.append(HexDump.intToHex(getFcPgdMother()));
-        buffer.append(" (").append(getFcPgdMother()).append(" )\n");
-
-        buffer.append("    .lcbPgdMother         = ");
-        buffer.append(HexDump.intToHex(getLcbPgdMother()));
-        buffer.append(" (").append(getLcbPgdMother()).append(" )\n");
-
-        buffer.append("    .fcBkdMother          = ");
-        buffer.append(HexDump.intToHex(getFcBkdMother()));
-        buffer.append(" (").append(getFcBkdMother()).append(" )\n");
-
-        buffer.append("    .lcbBkdMother         = ");
-        buffer.append(HexDump.intToHex(getLcbBkdMother()));
-        buffer.append(" (").append(getLcbBkdMother()).append(" )\n");
-
-        buffer.append("    .fcPgdFtn             = ");
-        buffer.append(HexDump.intToHex(getFcPgdFtn()));
-        buffer.append(" (").append(getFcPgdFtn()).append(" )\n");
-
-        buffer.append("    .lcbPgdFtn            = ");
-        buffer.append(HexDump.intToHex(getLcbPgdFtn()));
-        buffer.append(" (").append(getLcbPgdFtn()).append(" )\n");
-
-        buffer.append("    .fcBkdFtn             = ");
-        buffer.append(HexDump.intToHex(getFcBkdFtn()));
-        buffer.append(" (").append(getFcBkdFtn()).append(" )\n");
-
-        buffer.append("    .lcbBkdFtn            = ");
-        buffer.append(HexDump.intToHex(getLcbBkdFtn()));
-        buffer.append(" (").append(getLcbBkdFtn()).append(" )\n");
-
-        buffer.append("    .fcPgdEdn             = ");
-        buffer.append(HexDump.intToHex(getFcPgdEdn()));
-        buffer.append(" (").append(getFcPgdEdn()).append(" )\n");
-
-        buffer.append("    .lcbPgdEdn            = ");
-        buffer.append(HexDump.intToHex(getLcbPgdEdn()));
-        buffer.append(" (").append(getLcbPgdEdn()).append(" )\n");
-
-        buffer.append("    .fcBkdEdn             = ");
-        buffer.append(HexDump.intToHex(getFcBkdEdn()));
-        buffer.append(" (").append(getFcBkdEdn()).append(" )\n");
-
-        buffer.append("    .lcbBkdEdn            = ");
-        buffer.append(HexDump.intToHex(getLcbBkdEdn()));
-        buffer.append(" (").append(getLcbBkdEdn()).append(" )\n");
-
-        buffer.append("    .fcSttbfIntlFld       = ");
-        buffer.append(HexDump.intToHex(getFcSttbfIntlFld()));
-        buffer.append(" (").append(getFcSttbfIntlFld()).append(" )\n");
-
-        buffer.append("    .lcbSttbfIntlFld      = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfIntlFld()));
-        buffer.append(" (").append(getLcbSttbfIntlFld()).append(" )\n");
-
-        buffer.append("    .fcRouteSlip          = ");
-        buffer.append(HexDump.intToHex(getFcRouteSlip()));
-        buffer.append(" (").append(getFcRouteSlip()).append(" )\n");
-
-        buffer.append("    .lcbRouteSlip         = ");
-        buffer.append(HexDump.intToHex(getLcbRouteSlip()));
-        buffer.append(" (").append(getLcbRouteSlip()).append(" )\n");
-
-        buffer.append("    .fcSttbSavedBy        = ");
-        buffer.append(HexDump.intToHex(getFcSttbSavedBy()));
-        buffer.append(" (").append(getFcSttbSavedBy()).append(" )\n");
-
-        buffer.append("    .lcbSttbSavedBy       = ");
-        buffer.append(HexDump.intToHex(getLcbSttbSavedBy()));
-        buffer.append(" (").append(getLcbSttbSavedBy()).append(" )\n");
-
-        buffer.append("    .fcSttbFnm            = ");
-        buffer.append(HexDump.intToHex(getFcSttbFnm()));
-        buffer.append(" (").append(getFcSttbFnm()).append(" )\n");
-
-        buffer.append("    .lcbSttbFnm           = ");
-        buffer.append(HexDump.intToHex(getLcbSttbFnm()));
-        buffer.append(" (").append(getLcbSttbFnm()).append(" )\n");
-
-        buffer.append("    .fcPlcfLst            = ");
-        buffer.append(HexDump.intToHex(getFcPlcfLst()));
-        buffer.append(" (").append(getFcPlcfLst()).append(" )\n");
-
-        buffer.append("    .lcbPlcfLst           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfLst()));
-        buffer.append(" (").append(getLcbPlcfLst()).append(" )\n");
-
-        buffer.append("    .fcPlfLfo             = ");
-        buffer.append(HexDump.intToHex(getFcPlfLfo()));
-        buffer.append(" (").append(getFcPlfLfo()).append(" )\n");
-
-        buffer.append("    .lcbPlfLfo            = ");
-        buffer.append(HexDump.intToHex(getLcbPlfLfo()));
-        buffer.append(" (").append(getLcbPlfLfo()).append(" )\n");
-
-        buffer.append("    .fcPlcftxbxBkd        = ");
-        buffer.append(HexDump.intToHex(getFcPlcftxbxBkd()));
-        buffer.append(" (").append(getFcPlcftxbxBkd()).append(" )\n");
-
-        buffer.append("    .lcbPlcftxbxBkd       = ");
-        buffer.append(HexDump.intToHex(getLcbPlcftxbxBkd()));
-        buffer.append(" (").append(getLcbPlcftxbxBkd()).append(" )\n");
-
-        buffer.append("    .fcPlcftxbxHdrBkd     = ");
-        buffer.append(HexDump.intToHex(getFcPlcftxbxHdrBkd()));
-        buffer.append(" (").append(getFcPlcftxbxHdrBkd()).append(" )\n");
-
-        buffer.append("    .lcbPlcftxbxHdrBkd    = ");
-        buffer.append(HexDump.intToHex(getLcbPlcftxbxHdrBkd()));
-        buffer.append(" (").append(getLcbPlcftxbxHdrBkd()).append(" )\n");
-
-        buffer.append("    .fcDocUndo            = ");
-        buffer.append(HexDump.intToHex(getFcDocUndo()));
-        buffer.append(" (").append(getFcDocUndo()).append(" )\n");
-
-        buffer.append("    .lcbDocUndo           = ");
-        buffer.append(HexDump.intToHex(getLcbDocUndo()));
-        buffer.append(" (").append(getLcbDocUndo()).append(" )\n");
-
-        buffer.append("    .fcRgbuse             = ");
-        buffer.append(HexDump.intToHex(getFcRgbuse()));
-        buffer.append(" (").append(getFcRgbuse()).append(" )\n");
-
-        buffer.append("    .lcbRgbuse            = ");
-        buffer.append(HexDump.intToHex(getLcbRgbuse()));
-        buffer.append(" (").append(getLcbRgbuse()).append(" )\n");
-
-        buffer.append("    .fcUsp                = ");
-        buffer.append(HexDump.intToHex(getFcUsp()));
-        buffer.append(" (").append(getFcUsp()).append(" )\n");
-
-        buffer.append("    .lcbUsp               = ");
-        buffer.append(HexDump.intToHex(getLcbUsp()));
-        buffer.append(" (").append(getLcbUsp()).append(" )\n");
-
-        buffer.append("    .fcUskf               = ");
-        buffer.append(HexDump.intToHex(getFcUskf()));
-        buffer.append(" (").append(getFcUskf()).append(" )\n");
-
-        buffer.append("    .lcbUskf              = ");
-        buffer.append(HexDump.intToHex(getLcbUskf()));
-        buffer.append(" (").append(getLcbUskf()).append(" )\n");
-
-        buffer.append("    .fcPlcupcRgbuse       = ");
-        buffer.append(HexDump.intToHex(getFcPlcupcRgbuse()));
-        buffer.append(" (").append(getFcPlcupcRgbuse()).append(" )\n");
-
-        buffer.append("    .lcbPlcupcRgbuse      = ");
-        buffer.append(HexDump.intToHex(getLcbPlcupcRgbuse()));
-        buffer.append(" (").append(getLcbPlcupcRgbuse()).append(" )\n");
-
-        buffer.append("    .fcPlcupcUsp          = ");
-        buffer.append(HexDump.intToHex(getFcPlcupcUsp()));
-        buffer.append(" (").append(getFcPlcupcUsp()).append(" )\n");
-
-        buffer.append("    .lcbPlcupcUsp         = ");
-        buffer.append(HexDump.intToHex(getLcbPlcupcUsp()));
-        buffer.append(" (").append(getLcbPlcupcUsp()).append(" )\n");
-
-        buffer.append("    .fcSttbGlsyStyle      = ");
-        buffer.append(HexDump.intToHex(getFcSttbGlsyStyle()));
-        buffer.append(" (").append(getFcSttbGlsyStyle()).append(" )\n");
-
-        buffer.append("    .lcbSttbGlsyStyle     = ");
-        buffer.append(HexDump.intToHex(getLcbSttbGlsyStyle()));
-        buffer.append(" (").append(getLcbSttbGlsyStyle()).append(" )\n");
-
-        buffer.append("    .fcPlgosl             = ");
-        buffer.append(HexDump.intToHex(getFcPlgosl()));
-        buffer.append(" (").append(getFcPlgosl()).append(" )\n");
-
-        buffer.append("    .lcbPlgosl            = ");
-        buffer.append(HexDump.intToHex(getLcbPlgosl()));
-        buffer.append(" (").append(getLcbPlgosl()).append(" )\n");
-
-        buffer.append("    .fcPlcocx             = ");
-        buffer.append(HexDump.intToHex(getFcPlcocx()));
-        buffer.append(" (").append(getFcPlcocx()).append(" )\n");
-
-        buffer.append("    .lcbPlcocx            = ");
-        buffer.append(HexDump.intToHex(getLcbPlcocx()));
-        buffer.append(" (").append(getLcbPlcocx()).append(" )\n");
-
-        buffer.append("    .fcPlcfbteLvc         = ");
-        buffer.append(HexDump.intToHex(getFcPlcfbteLvc()));
-        buffer.append(" (").append(getFcPlcfbteLvc()).append(" )\n");
-
-        buffer.append("    .lcbPlcfbteLvc        = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfbteLvc()));
-        buffer.append(" (").append(getLcbPlcfbteLvc()).append(" )\n");
-
-        buffer.append("    .dwLowDateTime        = ");
-        buffer.append(HexDump.intToHex(getDwLowDateTime()));
-        buffer.append(" (").append(getDwLowDateTime()).append(" )\n");
-
-        buffer.append("    .dwHighDateTime       = ");
-        buffer.append(HexDump.intToHex(getDwHighDateTime()));
-        buffer.append(" (").append(getDwHighDateTime()).append(" )\n");
-
-        buffer.append("    .fcPlcflvc            = ");
-        buffer.append(HexDump.intToHex(getFcPlcflvc()));
-        buffer.append(" (").append(getFcPlcflvc()).append(" )\n");
-
-        buffer.append("    .lcbPlcflvc           = ");
-        buffer.append(HexDump.intToHex(getLcbPlcflvc()));
-        buffer.append(" (").append(getLcbPlcflvc()).append(" )\n");
-
-        buffer.append("    .fcPlcasumy           = ");
-        buffer.append(HexDump.intToHex(getFcPlcasumy()));
-        buffer.append(" (").append(getFcPlcasumy()).append(" )\n");
-
-        buffer.append("    .lcbPlcasumy          = ");
-        buffer.append(HexDump.intToHex(getLcbPlcasumy()));
-        buffer.append(" (").append(getLcbPlcasumy()).append(" )\n");
-
-        buffer.append("    .fcPlcfgram           = ");
-        buffer.append(HexDump.intToHex(getFcPlcfgram()));
-        buffer.append(" (").append(getFcPlcfgram()).append(" )\n");
-
-        buffer.append("    .lcbPlcfgram          = ");
-        buffer.append(HexDump.intToHex(getLcbPlcfgram()));
-        buffer.append(" (").append(getLcbPlcfgram()).append(" )\n");
-
-        buffer.append("    .fcSttbListNames      = ");
-        buffer.append(HexDump.intToHex(getFcSttbListNames()));
-        buffer.append(" (").append(getFcSttbListNames()).append(" )\n");
-
-        buffer.append("    .lcbSttbListNames     = ");
-        buffer.append(HexDump.intToHex(getLcbSttbListNames()));
-        buffer.append(" (").append(getLcbSttbListNames()).append(" )\n");
-
-        buffer.append("    .fcSttbfUssr          = ");
-        buffer.append(HexDump.intToHex(getFcSttbfUssr()));
-        buffer.append(" (").append(getFcSttbfUssr()).append(" )\n");
-
-        buffer.append("    .lcbSttbfUssr         = ");
-        buffer.append(HexDump.intToHex(getLcbSttbfUssr()));
-        buffer.append(" (").append(getLcbSttbfUssr()).append(" )\n");
-
-        buffer.append("[/FIB]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 2 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4;
-    }
-
-
-
-    /**
-     * Get the wIdent field for the FIB record.
-     */
-    public int getWIdent()
-    {
-        return field_1_wIdent;
-    }
-
-    /**
-     * Set the wIdent field for the FIB record.
-     */
-    public void setWIdent(int field_1_wIdent)
-    {
-        this.field_1_wIdent = field_1_wIdent;
-    }
-
-    /**
-     * Get the nFib field for the FIB record.
-     */
-    public int getNFib()
-    {
-        return field_2_nFib;
-    }
-
-    /**
-     * Set the nFib field for the FIB record.
-     */
-    public void setNFib(int field_2_nFib)
-    {
-        this.field_2_nFib = field_2_nFib;
-    }
-
-    /**
-     * Get the nProduct field for the FIB record.
-     */
-    public int getNProduct()
-    {
-        return field_3_nProduct;
-    }
-
-    /**
-     * Set the nProduct field for the FIB record.
-     */
-    public void setNProduct(int field_3_nProduct)
-    {
-        this.field_3_nProduct = field_3_nProduct;
-    }
-
-    /**
-     * Get the lid field for the FIB record.
-     */
-    public int getLid()
-    {
-        return field_4_lid;
-    }
-
-    /**
-     * Set the lid field for the FIB record.
-     */
-    public void setLid(int field_4_lid)
-    {
-        this.field_4_lid = field_4_lid;
-    }
-
-    /**
-     * Get the pnNext field for the FIB record.
-     */
-    public int getPnNext()
-    {
-        return field_5_pnNext;
-    }
-
-    /**
-     * Set the pnNext field for the FIB record.
-     */
-    public void setPnNext(int field_5_pnNext)
-    {
-        this.field_5_pnNext = field_5_pnNext;
-    }
-
-    /**
-     * Get the options field for the FIB record.
-     */
-    public short getOptions()
-    {
-        return field_6_options;
-    }
-
-    /**
-     * Set the options field for the FIB record.
-     */
-    public void setOptions(short field_6_options)
-    {
-        this.field_6_options = field_6_options;
-    }
-
-    /**
-     * Get the nFibBack field for the FIB record.
-     */
-    public int getNFibBack()
-    {
-        return field_7_nFibBack;
-    }
-
-    /**
-     * Set the nFibBack field for the FIB record.
-     */
-    public void setNFibBack(int field_7_nFibBack)
-    {
-        this.field_7_nFibBack = field_7_nFibBack;
-    }
-
-    /**
-     * Get the lKey field for the FIB record.
-     */
-    public int getLKey()
-    {
-        return field_8_lKey;
-    }
-
-    /**
-     * Set the lKey field for the FIB record.
-     */
-    public void setLKey(int field_8_lKey)
-    {
-        this.field_8_lKey = field_8_lKey;
-    }
-
-    /**
-     * Get the envr field for the FIB record.
-     */
-    public int getEnvr()
-    {
-        return field_9_envr;
-    }
-
-    /**
-     * Set the envr field for the FIB record.
-     */
-    public void setEnvr(int field_9_envr)
-    {
-        this.field_9_envr = field_9_envr;
-    }
-
-    /**
-     * Get the history field for the FIB record.
-     */
-    public short getHistory()
-    {
-        return field_10_history;
-    }
-
-    /**
-     * Set the history field for the FIB record.
-     */
-    public void setHistory(short field_10_history)
-    {
-        this.field_10_history = field_10_history;
-    }
-
-    /**
-     * Get the chs field for the FIB record.
-     */
-    public int getChs()
-    {
-        return field_11_chs;
-    }
-
-    /**
-     * Set the chs field for the FIB record.
-     */
-    public void setChs(int field_11_chs)
-    {
-        this.field_11_chs = field_11_chs;
-    }
-
-    /**
-     * Get the chsTables field for the FIB record.
-     */
-    public int getChsTables()
-    {
-        return field_12_chsTables;
-    }
-
-    /**
-     * Set the chsTables field for the FIB record.
-     */
-    public void setChsTables(int field_12_chsTables)
-    {
-        this.field_12_chsTables = field_12_chsTables;
-    }
-
-    /**
-     * Get the fcMin field for the FIB record.
-     */
-    public int getFcMin()
-    {
-        return field_13_fcMin;
-    }
-
-    /**
-     * Set the fcMin field for the FIB record.
-     */
-    public void setFcMin(int field_13_fcMin)
-    {
-        this.field_13_fcMin = field_13_fcMin;
-    }
-
-    /**
-     * Get the fcMac field for the FIB record.
-     */
-    public int getFcMac()
-    {
-        return field_14_fcMac;
-    }
-
-    /**
-     * Set the fcMac field for the FIB record.
-     */
-    public void setFcMac(int field_14_fcMac)
-    {
-        this.field_14_fcMac = field_14_fcMac;
-    }
-
-    /**
-     * Get the csw field for the FIB record.
-     */
-    public int getCsw()
-    {
-        return field_15_csw;
-    }
-
-    /**
-     * Set the csw field for the FIB record.
-     */
-    public void setCsw(int field_15_csw)
-    {
-        this.field_15_csw = field_15_csw;
-    }
-
-    /**
-     * Get the wMagicCreated field for the FIB record.
-     */
-    public int getWMagicCreated()
-    {
-        return field_16_wMagicCreated;
-    }
-
-    /**
-     * Set the wMagicCreated field for the FIB record.
-     */
-    public void setWMagicCreated(int field_16_wMagicCreated)
-    {
-        this.field_16_wMagicCreated = field_16_wMagicCreated;
-    }
-
-    /**
-     * Get the wMagicRevised field for the FIB record.
-     */
-    public int getWMagicRevised()
-    {
-        return field_17_wMagicRevised;
-    }
-
-    /**
-     * Set the wMagicRevised field for the FIB record.
-     */
-    public void setWMagicRevised(int field_17_wMagicRevised)
-    {
-        this.field_17_wMagicRevised = field_17_wMagicRevised;
-    }
-
-    /**
-     * Get the wMagicCreatedPrivate field for the FIB record.
-     */
-    public int getWMagicCreatedPrivate()
-    {
-        return field_18_wMagicCreatedPrivate;
-    }
-
-    /**
-     * Set the wMagicCreatedPrivate field for the FIB record.
-     */
-    public void setWMagicCreatedPrivate(int field_18_wMagicCreatedPrivate)
-    {
-        this.field_18_wMagicCreatedPrivate = field_18_wMagicCreatedPrivate;
-    }
-
-    /**
-     * Get the wMagicRevisedPrivate field for the FIB record.
-     */
-    public int getWMagicRevisedPrivate()
-    {
-        return field_19_wMagicRevisedPrivate;
-    }
-
-    /**
-     * Set the wMagicRevisedPrivate field for the FIB record.
-     */
-    public void setWMagicRevisedPrivate(int field_19_wMagicRevisedPrivate)
-    {
-        this.field_19_wMagicRevisedPrivate = field_19_wMagicRevisedPrivate;
-    }
-
-    /**
-     * Get the pnFbpChpFirst_W6 field for the FIB record.
-     */
-    public int getPnFbpChpFirst_W6()
-    {
-        return field_20_pnFbpChpFirst_W6;
-    }
-
-    /**
-     * Set the pnFbpChpFirst_W6 field for the FIB record.
-     */
-    public void setPnFbpChpFirst_W6(int field_20_pnFbpChpFirst_W6)
-    {
-        this.field_20_pnFbpChpFirst_W6 = field_20_pnFbpChpFirst_W6;
-    }
-
-    /**
-     * Get the pnChpFirst_W6 field for the FIB record.
-     */
-    public int getPnChpFirst_W6()
-    {
-        return field_21_pnChpFirst_W6;
-    }
-
-    /**
-     * Set the pnChpFirst_W6 field for the FIB record.
-     */
-    public void setPnChpFirst_W6(int field_21_pnChpFirst_W6)
-    {
-        this.field_21_pnChpFirst_W6 = field_21_pnChpFirst_W6;
-    }
-
-    /**
-     * Get the cpnBteChp_W6 field for the FIB record.
-     */
-    public int getCpnBteChp_W6()
-    {
-        return field_22_cpnBteChp_W6;
-    }
-
-    /**
-     * Set the cpnBteChp_W6 field for the FIB record.
-     */
-    public void setCpnBteChp_W6(int field_22_cpnBteChp_W6)
-    {
-        this.field_22_cpnBteChp_W6 = field_22_cpnBteChp_W6;
-    }
-
-    /**
-     * Get the pnFbpPapFirst_W6 field for the FIB record.
-     */
-    public int getPnFbpPapFirst_W6()
-    {
-        return field_23_pnFbpPapFirst_W6;
-    }
-
-    /**
-     * Set the pnFbpPapFirst_W6 field for the FIB record.
-     */
-    public void setPnFbpPapFirst_W6(int field_23_pnFbpPapFirst_W6)
-    {
-        this.field_23_pnFbpPapFirst_W6 = field_23_pnFbpPapFirst_W6;
-    }
-
-    /**
-     * Get the pnPapFirst_W6 field for the FIB record.
-     */
-    public int getPnPapFirst_W6()
-    {
-        return field_24_pnPapFirst_W6;
-    }
-
-    /**
-     * Set the pnPapFirst_W6 field for the FIB record.
-     */
-    public void setPnPapFirst_W6(int field_24_pnPapFirst_W6)
-    {
-        this.field_24_pnPapFirst_W6 = field_24_pnPapFirst_W6;
-    }
-
-    /**
-     * Get the cpnBtePap_W6 field for the FIB record.
-     */
-    public int getCpnBtePap_W6()
-    {
-        return field_25_cpnBtePap_W6;
-    }
-
-    /**
-     * Set the cpnBtePap_W6 field for the FIB record.
-     */
-    public void setCpnBtePap_W6(int field_25_cpnBtePap_W6)
-    {
-        this.field_25_cpnBtePap_W6 = field_25_cpnBtePap_W6;
-    }
-
-    /**
-     * Get the pnFbpLvcFirst_W6 field for the FIB record.
-     */
-    public int getPnFbpLvcFirst_W6()
-    {
-        return field_26_pnFbpLvcFirst_W6;
-    }
-
-    /**
-     * Set the pnFbpLvcFirst_W6 field for the FIB record.
-     */
-    public void setPnFbpLvcFirst_W6(int field_26_pnFbpLvcFirst_W6)
-    {
-        this.field_26_pnFbpLvcFirst_W6 = field_26_pnFbpLvcFirst_W6;
-    }
-
-    /**
-     * Get the pnLvcFirst_W6 field for the FIB record.
-     */
-    public int getPnLvcFirst_W6()
-    {
-        return field_27_pnLvcFirst_W6;
-    }
-
-    /**
-     * Set the pnLvcFirst_W6 field for the FIB record.
-     */
-    public void setPnLvcFirst_W6(int field_27_pnLvcFirst_W6)
-    {
-        this.field_27_pnLvcFirst_W6 = field_27_pnLvcFirst_W6;
-    }
-
-    /**
-     * Get the cpnBteLvc_W6 field for the FIB record.
-     */
-    public int getCpnBteLvc_W6()
-    {
-        return field_28_cpnBteLvc_W6;
-    }
-
-    /**
-     * Set the cpnBteLvc_W6 field for the FIB record.
-     */
-    public void setCpnBteLvc_W6(int field_28_cpnBteLvc_W6)
-    {
-        this.field_28_cpnBteLvc_W6 = field_28_cpnBteLvc_W6;
-    }
-
-    /**
-     * Get the lidFE field for the FIB record.
-     */
-    public int getLidFE()
-    {
-        return field_29_lidFE;
-    }
-
-    /**
-     * Set the lidFE field for the FIB record.
-     */
-    public void setLidFE(int field_29_lidFE)
-    {
-        this.field_29_lidFE = field_29_lidFE;
-    }
-
-    /**
-     * Get the clw field for the FIB record.
-     */
-    public int getClw()
-    {
-        return field_30_clw;
-    }
-
-    /**
-     * Set the clw field for the FIB record.
-     */
-    public void setClw(int field_30_clw)
-    {
-        this.field_30_clw = field_30_clw;
-    }
-
-    /**
-     * Get the cbMac field for the FIB record.
-     */
-    public int getCbMac()
-    {
-        return field_31_cbMac;
-    }
-
-    /**
-     * Set the cbMac field for the FIB record.
-     */
-    public void setCbMac(int field_31_cbMac)
-    {
-        this.field_31_cbMac = field_31_cbMac;
-    }
-
-    /**
-     * Get the lProductCreated field for the FIB record.
-     */
-    public int getLProductCreated()
-    {
-        return field_32_lProductCreated;
-    }
-
-    /**
-     * Set the lProductCreated field for the FIB record.
-     */
-    public void setLProductCreated(int field_32_lProductCreated)
-    {
-        this.field_32_lProductCreated = field_32_lProductCreated;
-    }
-
-    /**
-     * Get the lProductRevised field for the FIB record.
-     */
-    public int getLProductRevised()
-    {
-        return field_33_lProductRevised;
-    }
-
-    /**
-     * Set the lProductRevised field for the FIB record.
-     */
-    public void setLProductRevised(int field_33_lProductRevised)
-    {
-        this.field_33_lProductRevised = field_33_lProductRevised;
-    }
-
-    /**
-     * Get the ccpText field for the FIB record.
-     */
-    public int getCcpText()
-    {
-        return field_34_ccpText;
-    }
-
-    /**
-     * Set the ccpText field for the FIB record.
-     */
-    public void setCcpText(int field_34_ccpText)
-    {
-        this.field_34_ccpText = field_34_ccpText;
-    }
-
-    /**
-     * Get the ccpFtn field for the FIB record.
-     */
-    public int getCcpFtn()
-    {
-        return field_35_ccpFtn;
-    }
-
-    /**
-     * Set the ccpFtn field for the FIB record.
-     */
-    public void setCcpFtn(int field_35_ccpFtn)
-    {
-        this.field_35_ccpFtn = field_35_ccpFtn;
-    }
-
-    /**
-     * Get the ccpHdd field for the FIB record.
-     */
-    public int getCcpHdd()
-    {
-        return field_36_ccpHdd;
-    }
-
-    /**
-     * Set the ccpHdd field for the FIB record.
-     */
-    public void setCcpHdd(int field_36_ccpHdd)
-    {
-        this.field_36_ccpHdd = field_36_ccpHdd;
-    }
-
-    /**
-     * Get the ccpMcr field for the FIB record.
-     */
-    public int getCcpMcr()
-    {
-        return field_37_ccpMcr;
-    }
-
-    /**
-     * Set the ccpMcr field for the FIB record.
-     */
-    public void setCcpMcr(int field_37_ccpMcr)
-    {
-        this.field_37_ccpMcr = field_37_ccpMcr;
-    }
-
-    /**
-     * Get the ccpAtn field for the FIB record.
-     */
-    public int getCcpAtn()
-    {
-        return field_38_ccpAtn;
-    }
-
-    /**
-     * Set the ccpAtn field for the FIB record.
-     */
-    public void setCcpAtn(int field_38_ccpAtn)
-    {
-        this.field_38_ccpAtn = field_38_ccpAtn;
-    }
-
-    /**
-     * Get the ccpEdn field for the FIB record.
-     */
-    public int getCcpEdn()
-    {
-        return field_39_ccpEdn;
-    }
-
-    /**
-     * Set the ccpEdn field for the FIB record.
-     */
-    public void setCcpEdn(int field_39_ccpEdn)
-    {
-        this.field_39_ccpEdn = field_39_ccpEdn;
-    }
-
-    /**
-     * Get the ccpTxbx field for the FIB record.
-     */
-    public int getCcpTxbx()
-    {
-        return field_40_ccpTxbx;
-    }
-
-    /**
-     * Set the ccpTxbx field for the FIB record.
-     */
-    public void setCcpTxbx(int field_40_ccpTxbx)
-    {
-        this.field_40_ccpTxbx = field_40_ccpTxbx;
-    }
-
-    /**
-     * Get the ccpHdrTxbx field for the FIB record.
-     */
-    public int getCcpHdrTxbx()
-    {
-        return field_41_ccpHdrTxbx;
-    }
-
-    /**
-     * Set the ccpHdrTxbx field for the FIB record.
-     */
-    public void setCcpHdrTxbx(int field_41_ccpHdrTxbx)
-    {
-        this.field_41_ccpHdrTxbx = field_41_ccpHdrTxbx;
-    }
-
-    /**
-     * Get the pnFbpChpFirst field for the FIB record.
-     */
-    public int getPnFbpChpFirst()
-    {
-        return field_42_pnFbpChpFirst;
-    }
-
-    /**
-     * Set the pnFbpChpFirst field for the FIB record.
-     */
-    public void setPnFbpChpFirst(int field_42_pnFbpChpFirst)
-    {
-        this.field_42_pnFbpChpFirst = field_42_pnFbpChpFirst;
-    }
-
-    /**
-     * Get the pnChpFirst field for the FIB record.
-     */
-    public int getPnChpFirst()
-    {
-        return field_43_pnChpFirst;
-    }
-
-    /**
-     * Set the pnChpFirst field for the FIB record.
-     */
-    public void setPnChpFirst(int field_43_pnChpFirst)
-    {
-        this.field_43_pnChpFirst = field_43_pnChpFirst;
-    }
-
-    /**
-     * Get the cpnBteChp field for the FIB record.
-     */
-    public int getCpnBteChp()
-    {
-        return field_44_cpnBteChp;
-    }
-
-    /**
-     * Set the cpnBteChp field for the FIB record.
-     */
-    public void setCpnBteChp(int field_44_cpnBteChp)
-    {
-        this.field_44_cpnBteChp = field_44_cpnBteChp;
-    }
-
-    /**
-     * Get the pnFbpPapFirst field for the FIB record.
-     */
-    public int getPnFbpPapFirst()
-    {
-        return field_45_pnFbpPapFirst;
-    }
-
-    /**
-     * Set the pnFbpPapFirst field for the FIB record.
-     */
-    public void setPnFbpPapFirst(int field_45_pnFbpPapFirst)
-    {
-        this.field_45_pnFbpPapFirst = field_45_pnFbpPapFirst;
-    }
-
-    /**
-     * Get the pnPapFirst field for the FIB record.
-     */
-    public int getPnPapFirst()
-    {
-        return field_46_pnPapFirst;
-    }
-
-    /**
-     * Set the pnPapFirst field for the FIB record.
-     */
-    public void setPnPapFirst(int field_46_pnPapFirst)
-    {
-        this.field_46_pnPapFirst = field_46_pnPapFirst;
-    }
-
-    /**
-     * Get the cpnBtePap field for the FIB record.
-     */
-    public int getCpnBtePap()
-    {
-        return field_47_cpnBtePap;
-    }
-
-    /**
-     * Set the cpnBtePap field for the FIB record.
-     */
-    public void setCpnBtePap(int field_47_cpnBtePap)
-    {
-        this.field_47_cpnBtePap = field_47_cpnBtePap;
-    }
-
-    /**
-     * Get the pnFbpLvcFirst field for the FIB record.
-     */
-    public int getPnFbpLvcFirst()
-    {
-        return field_48_pnFbpLvcFirst;
-    }
-
-    /**
-     * Set the pnFbpLvcFirst field for the FIB record.
-     */
-    public void setPnFbpLvcFirst(int field_48_pnFbpLvcFirst)
-    {
-        this.field_48_pnFbpLvcFirst = field_48_pnFbpLvcFirst;
-    }
-
-    /**
-     * Get the pnLvcFirst field for the FIB record.
-     */
-    public int getPnLvcFirst()
-    {
-        return field_49_pnLvcFirst;
-    }
-
-    /**
-     * Set the pnLvcFirst field for the FIB record.
-     */
-    public void setPnLvcFirst(int field_49_pnLvcFirst)
-    {
-        this.field_49_pnLvcFirst = field_49_pnLvcFirst;
-    }
-
-    /**
-     * Get the cpnBteLvc field for the FIB record.
-     */
-    public int getCpnBteLvc()
-    {
-        return field_50_cpnBteLvc;
-    }
-
-    /**
-     * Set the cpnBteLvc field for the FIB record.
-     */
-    public void setCpnBteLvc(int field_50_cpnBteLvc)
-    {
-        this.field_50_cpnBteLvc = field_50_cpnBteLvc;
-    }
-
-    /**
-     * Get the fcIslandFirst field for the FIB record.
-     */
-    public int getFcIslandFirst()
-    {
-        return field_51_fcIslandFirst;
-    }
-
-    /**
-     * Set the fcIslandFirst field for the FIB record.
-     */
-    public void setFcIslandFirst(int field_51_fcIslandFirst)
-    {
-        this.field_51_fcIslandFirst = field_51_fcIslandFirst;
-    }
-
-    /**
-     * Get the fcIslandLim field for the FIB record.
-     */
-    public int getFcIslandLim()
-    {
-        return field_52_fcIslandLim;
-    }
-
-    /**
-     * Set the fcIslandLim field for the FIB record.
-     */
-    public void setFcIslandLim(int field_52_fcIslandLim)
-    {
-        this.field_52_fcIslandLim = field_52_fcIslandLim;
-    }
-
-    /**
-     * Get the cfclcb field for the FIB record.
-     */
-    public int getCfclcb()
-    {
-        return field_53_cfclcb;
-    }
-
-    /**
-     * Set the cfclcb field for the FIB record.
-     */
-    public void setCfclcb(int field_53_cfclcb)
-    {
-        this.field_53_cfclcb = field_53_cfclcb;
-    }
-
-    /**
-     * Get the fcStshfOrig field for the FIB record.
-     */
-    public int getFcStshfOrig()
-    {
-        return field_54_fcStshfOrig;
-    }
-
-    /**
-     * Set the fcStshfOrig field for the FIB record.
-     */
-    public void setFcStshfOrig(int field_54_fcStshfOrig)
-    {
-        this.field_54_fcStshfOrig = field_54_fcStshfOrig;
-    }
-
-    /**
-     * Get the lcbStshfOrig field for the FIB record.
-     */
-    public int getLcbStshfOrig()
-    {
-        return field_55_lcbStshfOrig;
-    }
-
-    /**
-     * Set the lcbStshfOrig field for the FIB record.
-     */
-    public void setLcbStshfOrig(int field_55_lcbStshfOrig)
-    {
-        this.field_55_lcbStshfOrig = field_55_lcbStshfOrig;
-    }
-
-    /**
-     * Get the fcStshf field for the FIB record.
-     */
-    public int getFcStshf()
-    {
-        return field_56_fcStshf;
-    }
-
-    /**
-     * Set the fcStshf field for the FIB record.
-     */
-    public void setFcStshf(int field_56_fcStshf)
-    {
-        this.field_56_fcStshf = field_56_fcStshf;
-    }
-
-    /**
-     * Get the lcbStshf field for the FIB record.
-     */
-    public int getLcbStshf()
-    {
-        return field_57_lcbStshf;
-    }
-
-    /**
-     * Set the lcbStshf field for the FIB record.
-     */
-    public void setLcbStshf(int field_57_lcbStshf)
-    {
-        this.field_57_lcbStshf = field_57_lcbStshf;
-    }
-
-    /**
-     * Get the fcPlcffndRef field for the FIB record.
-     */
-    public int getFcPlcffndRef()
-    {
-        return field_58_fcPlcffndRef;
-    }
-
-    /**
-     * Set the fcPlcffndRef field for the FIB record.
-     */
-    public void setFcPlcffndRef(int field_58_fcPlcffndRef)
-    {
-        this.field_58_fcPlcffndRef = field_58_fcPlcffndRef;
-    }
-
-    /**
-     * Get the lcbPlcffndRef field for the FIB record.
-     */
-    public int getLcbPlcffndRef()
-    {
-        return field_59_lcbPlcffndRef;
-    }
-
-    /**
-     * Set the lcbPlcffndRef field for the FIB record.
-     */
-    public void setLcbPlcffndRef(int field_59_lcbPlcffndRef)
-    {
-        this.field_59_lcbPlcffndRef = field_59_lcbPlcffndRef;
-    }
-
-    /**
-     * Get the fcPlcffndTxt field for the FIB record.
-     */
-    public int getFcPlcffndTxt()
-    {
-        return field_60_fcPlcffndTxt;
-    }
-
-    /**
-     * Set the fcPlcffndTxt field for the FIB record.
-     */
-    public void setFcPlcffndTxt(int field_60_fcPlcffndTxt)
-    {
-        this.field_60_fcPlcffndTxt = field_60_fcPlcffndTxt;
-    }
-
-    /**
-     * Get the lcbPlcffndTxt field for the FIB record.
-     */
-    public int getLcbPlcffndTxt()
-    {
-        return field_61_lcbPlcffndTxt;
-    }
-
-    /**
-     * Set the lcbPlcffndTxt field for the FIB record.
-     */
-    public void setLcbPlcffndTxt(int field_61_lcbPlcffndTxt)
-    {
-        this.field_61_lcbPlcffndTxt = field_61_lcbPlcffndTxt;
-    }
-
-    /**
-     * Get the fcPlcfandRef field for the FIB record.
-     */
-    public int getFcPlcfandRef()
-    {
-        return field_62_fcPlcfandRef;
-    }
-
-    /**
-     * Set the fcPlcfandRef field for the FIB record.
-     */
-    public void setFcPlcfandRef(int field_62_fcPlcfandRef)
-    {
-        this.field_62_fcPlcfandRef = field_62_fcPlcfandRef;
-    }
-
-    /**
-     * Get the lcbPlcfandRef field for the FIB record.
-     */
-    public int getLcbPlcfandRef()
-    {
-        return field_63_lcbPlcfandRef;
-    }
-
-    /**
-     * Set the lcbPlcfandRef field for the FIB record.
-     */
-    public void setLcbPlcfandRef(int field_63_lcbPlcfandRef)
-    {
-        this.field_63_lcbPlcfandRef = field_63_lcbPlcfandRef;
-    }
-
-    /**
-     * Get the fcPlcfandTxt field for the FIB record.
-     */
-    public int getFcPlcfandTxt()
-    {
-        return field_64_fcPlcfandTxt;
-    }
-
-    /**
-     * Set the fcPlcfandTxt field for the FIB record.
-     */
-    public void setFcPlcfandTxt(int field_64_fcPlcfandTxt)
-    {
-        this.field_64_fcPlcfandTxt = field_64_fcPlcfandTxt;
-    }
-
-    /**
-     * Get the lcbPlcfandTxt field for the FIB record.
-     */
-    public int getLcbPlcfandTxt()
-    {
-        return field_65_lcbPlcfandTxt;
-    }
-
-    /**
-     * Set the lcbPlcfandTxt field for the FIB record.
-     */
-    public void setLcbPlcfandTxt(int field_65_lcbPlcfandTxt)
-    {
-        this.field_65_lcbPlcfandTxt = field_65_lcbPlcfandTxt;
-    }
-
-    /**
-     * Get the fcPlcfsed field for the FIB record.
-     */
-    public int getFcPlcfsed()
-    {
-        return field_66_fcPlcfsed;
-    }
-
-    /**
-     * Set the fcPlcfsed field for the FIB record.
-     */
-    public void setFcPlcfsed(int field_66_fcPlcfsed)
-    {
-        this.field_66_fcPlcfsed = field_66_fcPlcfsed;
-    }
-
-    /**
-     * Get the lcbPlcfsed field for the FIB record.
-     */
-    public int getLcbPlcfsed()
-    {
-        return field_67_lcbPlcfsed;
-    }
-
-    /**
-     * Set the lcbPlcfsed field for the FIB record.
-     */
-    public void setLcbPlcfsed(int field_67_lcbPlcfsed)
-    {
-        this.field_67_lcbPlcfsed = field_67_lcbPlcfsed;
-    }
-
-    /**
-     * Get the fcPlcpad field for the FIB record.
-     */
-    public int getFcPlcpad()
-    {
-        return field_68_fcPlcpad;
-    }
-
-    /**
-     * Set the fcPlcpad field for the FIB record.
-     */
-    public void setFcPlcpad(int field_68_fcPlcpad)
-    {
-        this.field_68_fcPlcpad = field_68_fcPlcpad;
-    }
-
-    /**
-     * Get the lcbPlcpad field for the FIB record.
-     */
-    public int getLcbPlcpad()
-    {
-        return field_69_lcbPlcpad;
-    }
-
-    /**
-     * Set the lcbPlcpad field for the FIB record.
-     */
-    public void setLcbPlcpad(int field_69_lcbPlcpad)
-    {
-        this.field_69_lcbPlcpad = field_69_lcbPlcpad;
-    }
-
-    /**
-     * Get the fcPlcfphe field for the FIB record.
-     */
-    public int getFcPlcfphe()
-    {
-        return field_70_fcPlcfphe;
-    }
-
-    /**
-     * Set the fcPlcfphe field for the FIB record.
-     */
-    public void setFcPlcfphe(int field_70_fcPlcfphe)
-    {
-        this.field_70_fcPlcfphe = field_70_fcPlcfphe;
-    }
-
-    /**
-     * Get the lcbPlcfphe field for the FIB record.
-     */
-    public int getLcbPlcfphe()
-    {
-        return field_71_lcbPlcfphe;
-    }
-
-    /**
-     * Set the lcbPlcfphe field for the FIB record.
-     */
-    public void setLcbPlcfphe(int field_71_lcbPlcfphe)
-    {
-        this.field_71_lcbPlcfphe = field_71_lcbPlcfphe;
-    }
-
-    /**
-     * Get the fcSttbfglsy field for the FIB record.
-     */
-    public int getFcSttbfglsy()
-    {
-        return field_72_fcSttbfglsy;
-    }
-
-    /**
-     * Set the fcSttbfglsy field for the FIB record.
-     */
-    public void setFcSttbfglsy(int field_72_fcSttbfglsy)
-    {
-        this.field_72_fcSttbfglsy = field_72_fcSttbfglsy;
-    }
-
-    /**
-     * Get the lcbSttbfglsy field for the FIB record.
-     */
-    public int getLcbSttbfglsy()
-    {
-        return field_73_lcbSttbfglsy;
-    }
-
-    /**
-     * Set the lcbSttbfglsy field for the FIB record.
-     */
-    public void setLcbSttbfglsy(int field_73_lcbSttbfglsy)
-    {
-        this.field_73_lcbSttbfglsy = field_73_lcbSttbfglsy;
-    }
-
-    /**
-     * Get the fcPlcfglsy field for the FIB record.
-     */
-    public int getFcPlcfglsy()
-    {
-        return field_74_fcPlcfglsy;
-    }
-
-    /**
-     * Set the fcPlcfglsy field for the FIB record.
-     */
-    public void setFcPlcfglsy(int field_74_fcPlcfglsy)
-    {
-        this.field_74_fcPlcfglsy = field_74_fcPlcfglsy;
-    }
-
-    /**
-     * Get the lcbPlcfglsy field for the FIB record.
-     */
-    public int getLcbPlcfglsy()
-    {
-        return field_75_lcbPlcfglsy;
-    }
-
-    /**
-     * Set the lcbPlcfglsy field for the FIB record.
-     */
-    public void setLcbPlcfglsy(int field_75_lcbPlcfglsy)
-    {
-        this.field_75_lcbPlcfglsy = field_75_lcbPlcfglsy;
-    }
-
-    /**
-     * Get the fcPlcfhdd field for the FIB record.
-     */
-    public int getFcPlcfhdd()
-    {
-        return field_76_fcPlcfhdd;
-    }
-
-    /**
-     * Set the fcPlcfhdd field for the FIB record.
-     */
-    public void setFcPlcfhdd(int field_76_fcPlcfhdd)
-    {
-        this.field_76_fcPlcfhdd = field_76_fcPlcfhdd;
-    }
-
-    /**
-     * Get the lcbPlcfhdd field for the FIB record.
-     */
-    public int getLcbPlcfhdd()
-    {
-        return field_77_lcbPlcfhdd;
-    }
-
-    /**
-     * Set the lcbPlcfhdd field for the FIB record.
-     */
-    public void setLcbPlcfhdd(int field_77_lcbPlcfhdd)
-    {
-        this.field_77_lcbPlcfhdd = field_77_lcbPlcfhdd;
-    }
-
-    /**
-     * Get the fcPlcfbteChpx field for the FIB record.
-     */
-    public int getFcPlcfbteChpx()
-    {
-        return field_78_fcPlcfbteChpx;
-    }
-
-    /**
-     * Set the fcPlcfbteChpx field for the FIB record.
-     */
-    public void setFcPlcfbteChpx(int field_78_fcPlcfbteChpx)
-    {
-        this.field_78_fcPlcfbteChpx = field_78_fcPlcfbteChpx;
-    }
-
-    /**
-     * Get the lcbPlcfbteChpx field for the FIB record.
-     */
-    public int getLcbPlcfbteChpx()
-    {
-        return field_79_lcbPlcfbteChpx;
-    }
-
-    /**
-     * Set the lcbPlcfbteChpx field for the FIB record.
-     */
-    public void setLcbPlcfbteChpx(int field_79_lcbPlcfbteChpx)
-    {
-        this.field_79_lcbPlcfbteChpx = field_79_lcbPlcfbteChpx;
-    }
-
-    /**
-     * Get the fcPlcfbtePapx field for the FIB record.
-     */
-    public int getFcPlcfbtePapx()
-    {
-        return field_80_fcPlcfbtePapx;
-    }
-
-    /**
-     * Set the fcPlcfbtePapx field for the FIB record.
-     */
-    public void setFcPlcfbtePapx(int field_80_fcPlcfbtePapx)
-    {
-        this.field_80_fcPlcfbtePapx = field_80_fcPlcfbtePapx;
-    }
-
-    /**
-     * Get the lcbPlcfbtePapx field for the FIB record.
-     */
-    public int getLcbPlcfbtePapx()
-    {
-        return field_81_lcbPlcfbtePapx;
-    }
-
-    /**
-     * Set the lcbPlcfbtePapx field for the FIB record.
-     */
-    public void setLcbPlcfbtePapx(int field_81_lcbPlcfbtePapx)
-    {
-        this.field_81_lcbPlcfbtePapx = field_81_lcbPlcfbtePapx;
-    }
-
-    /**
-     * Get the fcPlcfsea field for the FIB record.
-     */
-    public int getFcPlcfsea()
-    {
-        return field_82_fcPlcfsea;
-    }
-
-    /**
-     * Set the fcPlcfsea field for the FIB record.
-     */
-    public void setFcPlcfsea(int field_82_fcPlcfsea)
-    {
-        this.field_82_fcPlcfsea = field_82_fcPlcfsea;
-    }
-
-    /**
-     * Get the lcbPlcfsea field for the FIB record.
-     */
-    public int getLcbPlcfsea()
-    {
-        return field_83_lcbPlcfsea;
-    }
-
-    /**
-     * Set the lcbPlcfsea field for the FIB record.
-     */
-    public void setLcbPlcfsea(int field_83_lcbPlcfsea)
-    {
-        this.field_83_lcbPlcfsea = field_83_lcbPlcfsea;
-    }
-
-    /**
-     * Get the fcSttbfffn field for the FIB record.
-     */
-    public int getFcSttbfffn()
-    {
-        return field_84_fcSttbfffn;
-    }
-
-    /**
-     * Set the fcSttbfffn field for the FIB record.
-     */
-    public void setFcSttbfffn(int field_84_fcSttbfffn)
-    {
-        this.field_84_fcSttbfffn = field_84_fcSttbfffn;
-    }
-
-    /**
-     * Get the lcbSttbfffn field for the FIB record.
-     */
-    public int getLcbSttbfffn()
-    {
-        return field_85_lcbSttbfffn;
-    }
-
-    /**
-     * Set the lcbSttbfffn field for the FIB record.
-     */
-    public void setLcbSttbfffn(int field_85_lcbSttbfffn)
-    {
-        this.field_85_lcbSttbfffn = field_85_lcbSttbfffn;
-    }
-
-    /**
-     * Get the fcPlcffldMom field for the FIB record.
-     */
-    public int getFcPlcffldMom()
-    {
-        return field_86_fcPlcffldMom;
-    }
-
-    /**
-     * Set the fcPlcffldMom field for the FIB record.
-     */
-    public void setFcPlcffldMom(int field_86_fcPlcffldMom)
-    {
-        this.field_86_fcPlcffldMom = field_86_fcPlcffldMom;
-    }
-
-    /**
-     * Get the lcbPlcffldMom field for the FIB record.
-     */
-    public int getLcbPlcffldMom()
-    {
-        return field_87_lcbPlcffldMom;
-    }
-
-    /**
-     * Set the lcbPlcffldMom field for the FIB record.
-     */
-    public void setLcbPlcffldMom(int field_87_lcbPlcffldMom)
-    {
-        this.field_87_lcbPlcffldMom = field_87_lcbPlcffldMom;
-    }
-
-    /**
-     * Get the fcPlcffldHdr field for the FIB record.
-     */
-    public int getFcPlcffldHdr()
-    {
-        return field_88_fcPlcffldHdr;
-    }
-
-    /**
-     * Set the fcPlcffldHdr field for the FIB record.
-     */
-    public void setFcPlcffldHdr(int field_88_fcPlcffldHdr)
-    {
-        this.field_88_fcPlcffldHdr = field_88_fcPlcffldHdr;
-    }
-
-    /**
-     * Get the lcbPlcffldHdr field for the FIB record.
-     */
-    public int getLcbPlcffldHdr()
-    {
-        return field_89_lcbPlcffldHdr;
-    }
-
-    /**
-     * Set the lcbPlcffldHdr field for the FIB record.
-     */
-    public void setLcbPlcffldHdr(int field_89_lcbPlcffldHdr)
-    {
-        this.field_89_lcbPlcffldHdr = field_89_lcbPlcffldHdr;
-    }
-
-    /**
-     * Get the fcPlcffldFtn field for the FIB record.
-     */
-    public int getFcPlcffldFtn()
-    {
-        return field_90_fcPlcffldFtn;
-    }
-
-    /**
-     * Set the fcPlcffldFtn field for the FIB record.
-     */
-    public void setFcPlcffldFtn(int field_90_fcPlcffldFtn)
-    {
-        this.field_90_fcPlcffldFtn = field_90_fcPlcffldFtn;
-    }
-
-    /**
-     * Get the lcbPlcffldFtn field for the FIB record.
-     */
-    public int getLcbPlcffldFtn()
-    {
-        return field_91_lcbPlcffldFtn;
-    }
-
-    /**
-     * Set the lcbPlcffldFtn field for the FIB record.
-     */
-    public void setLcbPlcffldFtn(int field_91_lcbPlcffldFtn)
-    {
-        this.field_91_lcbPlcffldFtn = field_91_lcbPlcffldFtn;
-    }
-
-    /**
-     * Get the fcPlcffldAtn field for the FIB record.
-     */
-    public int getFcPlcffldAtn()
-    {
-        return field_92_fcPlcffldAtn;
-    }
-
-    /**
-     * Set the fcPlcffldAtn field for the FIB record.
-     */
-    public void setFcPlcffldAtn(int field_92_fcPlcffldAtn)
-    {
-        this.field_92_fcPlcffldAtn = field_92_fcPlcffldAtn;
-    }
-
-    /**
-     * Get the lcbPlcffldAtn field for the FIB record.
-     */
-    public int getLcbPlcffldAtn()
-    {
-        return field_93_lcbPlcffldAtn;
-    }
-
-    /**
-     * Set the lcbPlcffldAtn field for the FIB record.
-     */
-    public void setLcbPlcffldAtn(int field_93_lcbPlcffldAtn)
-    {
-        this.field_93_lcbPlcffldAtn = field_93_lcbPlcffldAtn;
-    }
-
-    /**
-     * Get the fcPlcffldMcr field for the FIB record.
-     */
-    public int getFcPlcffldMcr()
-    {
-        return field_94_fcPlcffldMcr;
-    }
-
-    /**
-     * Set the fcPlcffldMcr field for the FIB record.
-     */
-    public void setFcPlcffldMcr(int field_94_fcPlcffldMcr)
-    {
-        this.field_94_fcPlcffldMcr = field_94_fcPlcffldMcr;
-    }
-
-    /**
-     * Get the lcbPlcffldMcr field for the FIB record.
-     */
-    public int getLcbPlcffldMcr()
-    {
-        return field_95_lcbPlcffldMcr;
-    }
-
-    /**
-     * Set the lcbPlcffldMcr field for the FIB record.
-     */
-    public void setLcbPlcffldMcr(int field_95_lcbPlcffldMcr)
-    {
-        this.field_95_lcbPlcffldMcr = field_95_lcbPlcffldMcr;
-    }
-
-    /**
-     * Get the fcSttbfbkmk field for the FIB record.
-     */
-    public int getFcSttbfbkmk()
-    {
-        return field_96_fcSttbfbkmk;
-    }
-
-    /**
-     * Set the fcSttbfbkmk field for the FIB record.
-     */
-    public void setFcSttbfbkmk(int field_96_fcSttbfbkmk)
-    {
-        this.field_96_fcSttbfbkmk = field_96_fcSttbfbkmk;
-    }
-
-    /**
-     * Get the lcbSttbfbkmk field for the FIB record.
-     */
-    public int getLcbSttbfbkmk()
-    {
-        return field_97_lcbSttbfbkmk;
-    }
-
-    /**
-     * Set the lcbSttbfbkmk field for the FIB record.
-     */
-    public void setLcbSttbfbkmk(int field_97_lcbSttbfbkmk)
-    {
-        this.field_97_lcbSttbfbkmk = field_97_lcbSttbfbkmk;
-    }
-
-    /**
-     * Get the fcPlcfbkf field for the FIB record.
-     */
-    public int getFcPlcfbkf()
-    {
-        return field_98_fcPlcfbkf;
-    }
-
-    /**
-     * Set the fcPlcfbkf field for the FIB record.
-     */
-    public void setFcPlcfbkf(int field_98_fcPlcfbkf)
-    {
-        this.field_98_fcPlcfbkf = field_98_fcPlcfbkf;
-    }
-
-    /**
-     * Get the lcbPlcfbkf field for the FIB record.
-     */
-    public int getLcbPlcfbkf()
-    {
-        return field_99_lcbPlcfbkf;
-    }
-
-    /**
-     * Set the lcbPlcfbkf field for the FIB record.
-     */
-    public void setLcbPlcfbkf(int field_99_lcbPlcfbkf)
-    {
-        this.field_99_lcbPlcfbkf = field_99_lcbPlcfbkf;
-    }
-
-    /**
-     * Get the fcPlcfbkl field for the FIB record.
-     */
-    public int getFcPlcfbkl()
-    {
-        return field_100_fcPlcfbkl;
-    }
-
-    /**
-     * Set the fcPlcfbkl field for the FIB record.
-     */
-    public void setFcPlcfbkl(int field_100_fcPlcfbkl)
-    {
-        this.field_100_fcPlcfbkl = field_100_fcPlcfbkl;
-    }
-
-    /**
-     * Get the lcbPlcfbkl field for the FIB record.
-     */
-    public int getLcbPlcfbkl()
-    {
-        return field_101_lcbPlcfbkl;
-    }
-
-    /**
-     * Set the lcbPlcfbkl field for the FIB record.
-     */
-    public void setLcbPlcfbkl(int field_101_lcbPlcfbkl)
-    {
-        this.field_101_lcbPlcfbkl = field_101_lcbPlcfbkl;
-    }
-
-    /**
-     * Get the fcCmds field for the FIB record.
-     */
-    public int getFcCmds()
-    {
-        return field_102_fcCmds;
-    }
-
-    /**
-     * Set the fcCmds field for the FIB record.
-     */
-    public void setFcCmds(int field_102_fcCmds)
-    {
-        this.field_102_fcCmds = field_102_fcCmds;
-    }
-
-    /**
-     * Get the lcbCmds field for the FIB record.
-     */
-    public int getLcbCmds()
-    {
-        return field_103_lcbCmds;
-    }
-
-    /**
-     * Set the lcbCmds field for the FIB record.
-     */
-    public void setLcbCmds(int field_103_lcbCmds)
-    {
-        this.field_103_lcbCmds = field_103_lcbCmds;
-    }
-
-    /**
-     * Get the fcPlcmcr field for the FIB record.
-     */
-    public int getFcPlcmcr()
-    {
-        return field_104_fcPlcmcr;
-    }
-
-    /**
-     * Set the fcPlcmcr field for the FIB record.
-     */
-    public void setFcPlcmcr(int field_104_fcPlcmcr)
-    {
-        this.field_104_fcPlcmcr = field_104_fcPlcmcr;
-    }
-
-    /**
-     * Get the lcbPlcmcr field for the FIB record.
-     */
-    public int getLcbPlcmcr()
-    {
-        return field_105_lcbPlcmcr;
-    }
-
-    /**
-     * Set the lcbPlcmcr field for the FIB record.
-     */
-    public void setLcbPlcmcr(int field_105_lcbPlcmcr)
-    {
-        this.field_105_lcbPlcmcr = field_105_lcbPlcmcr;
-    }
-
-    /**
-     * Get the fcSttbfmcr field for the FIB record.
-     */
-    public int getFcSttbfmcr()
-    {
-        return field_106_fcSttbfmcr;
-    }
-
-    /**
-     * Set the fcSttbfmcr field for the FIB record.
-     */
-    public void setFcSttbfmcr(int field_106_fcSttbfmcr)
-    {
-        this.field_106_fcSttbfmcr = field_106_fcSttbfmcr;
-    }
-
-    /**
-     * Get the lcbSttbfmcr field for the FIB record.
-     */
-    public int getLcbSttbfmcr()
-    {
-        return field_107_lcbSttbfmcr;
-    }
-
-    /**
-     * Set the lcbSttbfmcr field for the FIB record.
-     */
-    public void setLcbSttbfmcr(int field_107_lcbSttbfmcr)
-    {
-        this.field_107_lcbSttbfmcr = field_107_lcbSttbfmcr;
-    }
-
-    /**
-     * Get the fcPrDrvr field for the FIB record.
-     */
-    public int getFcPrDrvr()
-    {
-        return field_108_fcPrDrvr;
-    }
-
-    /**
-     * Set the fcPrDrvr field for the FIB record.
-     */
-    public void setFcPrDrvr(int field_108_fcPrDrvr)
-    {
-        this.field_108_fcPrDrvr = field_108_fcPrDrvr;
-    }
-
-    /**
-     * Get the lcbPrDrvr field for the FIB record.
-     */
-    public int getLcbPrDrvr()
-    {
-        return field_109_lcbPrDrvr;
-    }
-
-    /**
-     * Set the lcbPrDrvr field for the FIB record.
-     */
-    public void setLcbPrDrvr(int field_109_lcbPrDrvr)
-    {
-        this.field_109_lcbPrDrvr = field_109_lcbPrDrvr;
-    }
-
-    /**
-     * Get the fcPrEnvPort field for the FIB record.
-     */
-    public int getFcPrEnvPort()
-    {
-        return field_110_fcPrEnvPort;
-    }
-
-    /**
-     * Set the fcPrEnvPort field for the FIB record.
-     */
-    public void setFcPrEnvPort(int field_110_fcPrEnvPort)
-    {
-        this.field_110_fcPrEnvPort = field_110_fcPrEnvPort;
-    }
-
-    /**
-     * Get the lcbPrEnvPort field for the FIB record.
-     */
-    public int getLcbPrEnvPort()
-    {
-        return field_111_lcbPrEnvPort;
-    }
-
-    /**
-     * Set the lcbPrEnvPort field for the FIB record.
-     */
-    public void setLcbPrEnvPort(int field_111_lcbPrEnvPort)
-    {
-        this.field_111_lcbPrEnvPort = field_111_lcbPrEnvPort;
-    }
-
-    /**
-     * Get the fcPrEnvLand field for the FIB record.
-     */
-    public int getFcPrEnvLand()
-    {
-        return field_112_fcPrEnvLand;
-    }
-
-    /**
-     * Set the fcPrEnvLand field for the FIB record.
-     */
-    public void setFcPrEnvLand(int field_112_fcPrEnvLand)
-    {
-        this.field_112_fcPrEnvLand = field_112_fcPrEnvLand;
-    }
-
-    /**
-     * Get the lcbPrEnvLand field for the FIB record.
-     */
-    public int getLcbPrEnvLand()
-    {
-        return field_113_lcbPrEnvLand;
-    }
-
-    /**
-     * Set the lcbPrEnvLand field for the FIB record.
-     */
-    public void setLcbPrEnvLand(int field_113_lcbPrEnvLand)
-    {
-        this.field_113_lcbPrEnvLand = field_113_lcbPrEnvLand;
-    }
-
-    /**
-     * Get the fcWss field for the FIB record.
-     */
-    public int getFcWss()
-    {
-        return field_114_fcWss;
-    }
-
-    /**
-     * Set the fcWss field for the FIB record.
-     */
-    public void setFcWss(int field_114_fcWss)
-    {
-        this.field_114_fcWss = field_114_fcWss;
-    }
-
-    /**
-     * Get the lcbWss field for the FIB record.
-     */
-    public int getLcbWss()
-    {
-        return field_115_lcbWss;
-    }
-
-    /**
-     * Set the lcbWss field for the FIB record.
-     */
-    public void setLcbWss(int field_115_lcbWss)
-    {
-        this.field_115_lcbWss = field_115_lcbWss;
-    }
-
-    /**
-     * Get the fcDop field for the FIB record.
-     */
-    public int getFcDop()
-    {
-        return field_116_fcDop;
-    }
-
-    /**
-     * Set the fcDop field for the FIB record.
-     */
-    public void setFcDop(int field_116_fcDop)
-    {
-        this.field_116_fcDop = field_116_fcDop;
-    }
-
-    /**
-     * Get the lcbDop field for the FIB record.
-     */
-    public int getLcbDop()
-    {
-        return field_117_lcbDop;
-    }
-
-    /**
-     * Set the lcbDop field for the FIB record.
-     */
-    public void setLcbDop(int field_117_lcbDop)
-    {
-        this.field_117_lcbDop = field_117_lcbDop;
-    }
-
-    /**
-     * Get the fcSttbfAssoc field for the FIB record.
-     */
-    public int getFcSttbfAssoc()
-    {
-        return field_118_fcSttbfAssoc;
-    }
-
-    /**
-     * Set the fcSttbfAssoc field for the FIB record.
-     */
-    public void setFcSttbfAssoc(int field_118_fcSttbfAssoc)
-    {
-        this.field_118_fcSttbfAssoc = field_118_fcSttbfAssoc;
-    }
-
-    /**
-     * Get the lcbSttbfAssoc field for the FIB record.
-     */
-    public int getLcbSttbfAssoc()
-    {
-        return field_119_lcbSttbfAssoc;
-    }
-
-    /**
-     * Set the lcbSttbfAssoc field for the FIB record.
-     */
-    public void setLcbSttbfAssoc(int field_119_lcbSttbfAssoc)
-    {
-        this.field_119_lcbSttbfAssoc = field_119_lcbSttbfAssoc;
-    }
-
-    /**
-     * Get the fcClx field for the FIB record.
-     */
-    public int getFcClx()
-    {
-        return field_120_fcClx;
-    }
-
-    /**
-     * Set the fcClx field for the FIB record.
-     */
-    public void setFcClx(int field_120_fcClx)
-    {
-        this.field_120_fcClx = field_120_fcClx;
-    }
-
-    /**
-     * Get the lcbClx field for the FIB record.
-     */
-    public int getLcbClx()
-    {
-        return field_121_lcbClx;
-    }
-
-    /**
-     * Set the lcbClx field for the FIB record.
-     */
-    public void setLcbClx(int field_121_lcbClx)
-    {
-        this.field_121_lcbClx = field_121_lcbClx;
-    }
-
-    /**
-     * Get the fcPlcfpgdFtn field for the FIB record.
-     */
-    public int getFcPlcfpgdFtn()
-    {
-        return field_122_fcPlcfpgdFtn;
-    }
-
-    /**
-     * Set the fcPlcfpgdFtn field for the FIB record.
-     */
-    public void setFcPlcfpgdFtn(int field_122_fcPlcfpgdFtn)
-    {
-        this.field_122_fcPlcfpgdFtn = field_122_fcPlcfpgdFtn;
-    }
-
-    /**
-     * Get the lcbPlcfpgdFtn field for the FIB record.
-     */
-    public int getLcbPlcfpgdFtn()
-    {
-        return field_123_lcbPlcfpgdFtn;
-    }
-
-    /**
-     * Set the lcbPlcfpgdFtn field for the FIB record.
-     */
-    public void setLcbPlcfpgdFtn(int field_123_lcbPlcfpgdFtn)
-    {
-        this.field_123_lcbPlcfpgdFtn = field_123_lcbPlcfpgdFtn;
-    }
-
-    /**
-     * Get the fcAutosaveSource field for the FIB record.
-     */
-    public int getFcAutosaveSource()
-    {
-        return field_124_fcAutosaveSource;
-    }
-
-    /**
-     * Set the fcAutosaveSource field for the FIB record.
-     */
-    public void setFcAutosaveSource(int field_124_fcAutosaveSource)
-    {
-        this.field_124_fcAutosaveSource = field_124_fcAutosaveSource;
-    }
-
-    /**
-     * Get the lcbAutosaveSource field for the FIB record.
-     */
-    public int getLcbAutosaveSource()
-    {
-        return field_125_lcbAutosaveSource;
-    }
-
-    /**
-     * Set the lcbAutosaveSource field for the FIB record.
-     */
-    public void setLcbAutosaveSource(int field_125_lcbAutosaveSource)
-    {
-        this.field_125_lcbAutosaveSource = field_125_lcbAutosaveSource;
-    }
-
-    /**
-     * Get the fcGrpXstAtnOwners field for the FIB record.
-     */
-    public int getFcGrpXstAtnOwners()
-    {
-        return field_126_fcGrpXstAtnOwners;
-    }
-
-    /**
-     * Set the fcGrpXstAtnOwners field for the FIB record.
-     */
-    public void setFcGrpXstAtnOwners(int field_126_fcGrpXstAtnOwners)
-    {
-        this.field_126_fcGrpXstAtnOwners = field_126_fcGrpXstAtnOwners;
-    }
-
-    /**
-     * Get the lcbGrpXstAtnOwners field for the FIB record.
-     */
-    public int getLcbGrpXstAtnOwners()
-    {
-        return field_127_lcbGrpXstAtnOwners;
-    }
-
-    /**
-     * Set the lcbGrpXstAtnOwners field for the FIB record.
-     */
-    public void setLcbGrpXstAtnOwners(int field_127_lcbGrpXstAtnOwners)
-    {
-        this.field_127_lcbGrpXstAtnOwners = field_127_lcbGrpXstAtnOwners;
-    }
-
-    /**
-     * Get the fcSttbfAtnbkmk field for the FIB record.
-     */
-    public int getFcSttbfAtnbkmk()
-    {
-        return field_128_fcSttbfAtnbkmk;
-    }
-
-    /**
-     * Set the fcSttbfAtnbkmk field for the FIB record.
-     */
-    public void setFcSttbfAtnbkmk(int field_128_fcSttbfAtnbkmk)
-    {
-        this.field_128_fcSttbfAtnbkmk = field_128_fcSttbfAtnbkmk;
-    }
-
-    /**
-     * Get the lcbSttbfAtnbkmk field for the FIB record.
-     */
-    public int getLcbSttbfAtnbkmk()
-    {
-        return field_129_lcbSttbfAtnbkmk;
-    }
-
-    /**
-     * Set the lcbSttbfAtnbkmk field for the FIB record.
-     */
-    public void setLcbSttbfAtnbkmk(int field_129_lcbSttbfAtnbkmk)
-    {
-        this.field_129_lcbSttbfAtnbkmk = field_129_lcbSttbfAtnbkmk;
-    }
-
-    /**
-     * Get the fcPlcdoaMom field for the FIB record.
-     */
-    public int getFcPlcdoaMom()
-    {
-        return field_130_fcPlcdoaMom;
-    }
-
-    /**
-     * Set the fcPlcdoaMom field for the FIB record.
-     */
-    public void setFcPlcdoaMom(int field_130_fcPlcdoaMom)
-    {
-        this.field_130_fcPlcdoaMom = field_130_fcPlcdoaMom;
-    }
-
-    /**
-     * Get the lcbPlcdoaMom field for the FIB record.
-     */
-    public int getLcbPlcdoaMom()
-    {
-        return field_131_lcbPlcdoaMom;
-    }
-
-    /**
-     * Set the lcbPlcdoaMom field for the FIB record.
-     */
-    public void setLcbPlcdoaMom(int field_131_lcbPlcdoaMom)
-    {
-        this.field_131_lcbPlcdoaMom = field_131_lcbPlcdoaMom;
-    }
-
-    /**
-     * Get the fcPlcdoaHdr field for the FIB record.
-     */
-    public int getFcPlcdoaHdr()
-    {
-        return field_132_fcPlcdoaHdr;
-    }
-
-    /**
-     * Set the fcPlcdoaHdr field for the FIB record.
-     */
-    public void setFcPlcdoaHdr(int field_132_fcPlcdoaHdr)
-    {
-        this.field_132_fcPlcdoaHdr = field_132_fcPlcdoaHdr;
-    }
-
-    /**
-     * Get the lcbPlcdoaHdr field for the FIB record.
-     */
-    public int getLcbPlcdoaHdr()
-    {
-        return field_133_lcbPlcdoaHdr;
-    }
-
-    /**
-     * Set the lcbPlcdoaHdr field for the FIB record.
-     */
-    public void setLcbPlcdoaHdr(int field_133_lcbPlcdoaHdr)
-    {
-        this.field_133_lcbPlcdoaHdr = field_133_lcbPlcdoaHdr;
-    }
-
-    /**
-     * Get the fcPlcspaMom field for the FIB record.
-     */
-    public int getFcPlcspaMom()
-    {
-        return field_134_fcPlcspaMom;
-    }
-
-    /**
-     * Set the fcPlcspaMom field for the FIB record.
-     */
-    public void setFcPlcspaMom(int field_134_fcPlcspaMom)
-    {
-        this.field_134_fcPlcspaMom = field_134_fcPlcspaMom;
-    }
-
-    /**
-     * Get the lcbPlcspaMom field for the FIB record.
-     */
-    public int getLcbPlcspaMom()
-    {
-        return field_135_lcbPlcspaMom;
-    }
-
-    /**
-     * Set the lcbPlcspaMom field for the FIB record.
-     */
-    public void setLcbPlcspaMom(int field_135_lcbPlcspaMom)
-    {
-        this.field_135_lcbPlcspaMom = field_135_lcbPlcspaMom;
-    }
-
-    /**
-     * Get the fcPlcspaHdr field for the FIB record.
-     */
-    public int getFcPlcspaHdr()
-    {
-        return field_136_fcPlcspaHdr;
-    }
-
-    /**
-     * Set the fcPlcspaHdr field for the FIB record.
-     */
-    public void setFcPlcspaHdr(int field_136_fcPlcspaHdr)
-    {
-        this.field_136_fcPlcspaHdr = field_136_fcPlcspaHdr;
-    }
-
-    /**
-     * Get the lcbPlcspaHdr field for the FIB record.
-     */
-    public int getLcbPlcspaHdr()
-    {
-        return field_137_lcbPlcspaHdr;
-    }
-
-    /**
-     * Set the lcbPlcspaHdr field for the FIB record.
-     */
-    public void setLcbPlcspaHdr(int field_137_lcbPlcspaHdr)
-    {
-        this.field_137_lcbPlcspaHdr = field_137_lcbPlcspaHdr;
-    }
-
-    /**
-     * Get the fcPlcfAtnbkf field for the FIB record.
-     */
-    public int getFcPlcfAtnbkf()
-    {
-        return field_138_fcPlcfAtnbkf;
-    }
-
-    /**
-     * Set the fcPlcfAtnbkf field for the FIB record.
-     */
-    public void setFcPlcfAtnbkf(int field_138_fcPlcfAtnbkf)
-    {
-        this.field_138_fcPlcfAtnbkf = field_138_fcPlcfAtnbkf;
-    }
-
-    /**
-     * Get the lcbPlcfAtnbkf field for the FIB record.
-     */
-    public int getLcbPlcfAtnbkf()
-    {
-        return field_139_lcbPlcfAtnbkf;
-    }
-
-    /**
-     * Set the lcbPlcfAtnbkf field for the FIB record.
-     */
-    public void setLcbPlcfAtnbkf(int field_139_lcbPlcfAtnbkf)
-    {
-        this.field_139_lcbPlcfAtnbkf = field_139_lcbPlcfAtnbkf;
-    }
-
-    /**
-     * Get the fcPlcfAtnbkl field for the FIB record.
-     */
-    public int getFcPlcfAtnbkl()
-    {
-        return field_140_fcPlcfAtnbkl;
-    }
-
-    /**
-     * Set the fcPlcfAtnbkl field for the FIB record.
-     */
-    public void setFcPlcfAtnbkl(int field_140_fcPlcfAtnbkl)
-    {
-        this.field_140_fcPlcfAtnbkl = field_140_fcPlcfAtnbkl;
-    }
-
-    /**
-     * Get the lcbPlcfAtnbkl field for the FIB record.
-     */
-    public int getLcbPlcfAtnbkl()
-    {
-        return field_141_lcbPlcfAtnbkl;
-    }
-
-    /**
-     * Set the lcbPlcfAtnbkl field for the FIB record.
-     */
-    public void setLcbPlcfAtnbkl(int field_141_lcbPlcfAtnbkl)
-    {
-        this.field_141_lcbPlcfAtnbkl = field_141_lcbPlcfAtnbkl;
-    }
-
-    /**
-     * Get the fcPms field for the FIB record.
-     */
-    public int getFcPms()
-    {
-        return field_142_fcPms;
-    }
-
-    /**
-     * Set the fcPms field for the FIB record.
-     */
-    public void setFcPms(int field_142_fcPms)
-    {
-        this.field_142_fcPms = field_142_fcPms;
-    }
-
-    /**
-     * Get the lcbPms field for the FIB record.
-     */
-    public int getLcbPms()
-    {
-        return field_143_lcbPms;
-    }
-
-    /**
-     * Set the lcbPms field for the FIB record.
-     */
-    public void setLcbPms(int field_143_lcbPms)
-    {
-        this.field_143_lcbPms = field_143_lcbPms;
-    }
-
-    /**
-     * Get the fcFormFldSttbs field for the FIB record.
-     */
-    public int getFcFormFldSttbs()
-    {
-        return field_144_fcFormFldSttbs;
-    }
-
-    /**
-     * Set the fcFormFldSttbs field for the FIB record.
-     */
-    public void setFcFormFldSttbs(int field_144_fcFormFldSttbs)
-    {
-        this.field_144_fcFormFldSttbs = field_144_fcFormFldSttbs;
-    }
-
-    /**
-     * Get the lcbFormFldSttbs field for the FIB record.
-     */
-    public int getLcbFormFldSttbs()
-    {
-        return field_145_lcbFormFldSttbs;
-    }
-
-    /**
-     * Set the lcbFormFldSttbs field for the FIB record.
-     */
-    public void setLcbFormFldSttbs(int field_145_lcbFormFldSttbs)
-    {
-        this.field_145_lcbFormFldSttbs = field_145_lcbFormFldSttbs;
-    }
-
-    /**
-     * Get the fcPlcfendRef field for the FIB record.
-     */
-    public int getFcPlcfendRef()
-    {
-        return field_146_fcPlcfendRef;
-    }
-
-    /**
-     * Set the fcPlcfendRef field for the FIB record.
-     */
-    public void setFcPlcfendRef(int field_146_fcPlcfendRef)
-    {
-        this.field_146_fcPlcfendRef = field_146_fcPlcfendRef;
-    }
-
-    /**
-     * Get the lcbPlcfendRef field for the FIB record.
-     */
-    public int getLcbPlcfendRef()
-    {
-        return field_147_lcbPlcfendRef;
-    }
-
-    /**
-     * Set the lcbPlcfendRef field for the FIB record.
-     */
-    public void setLcbPlcfendRef(int field_147_lcbPlcfendRef)
-    {
-        this.field_147_lcbPlcfendRef = field_147_lcbPlcfendRef;
-    }
-
-    /**
-     * Get the fcPlcfendTxt field for the FIB record.
-     */
-    public int getFcPlcfendTxt()
-    {
-        return field_148_fcPlcfendTxt;
-    }
-
-    /**
-     * Set the fcPlcfendTxt field for the FIB record.
-     */
-    public void setFcPlcfendTxt(int field_148_fcPlcfendTxt)
-    {
-        this.field_148_fcPlcfendTxt = field_148_fcPlcfendTxt;
-    }
-
-    /**
-     * Get the lcbPlcfendTxt field for the FIB record.
-     */
-    public int getLcbPlcfendTxt()
-    {
-        return field_149_lcbPlcfendTxt;
-    }
-
-    /**
-     * Set the lcbPlcfendTxt field for the FIB record.
-     */
-    public void setLcbPlcfendTxt(int field_149_lcbPlcfendTxt)
-    {
-        this.field_149_lcbPlcfendTxt = field_149_lcbPlcfendTxt;
-    }
-
-    /**
-     * Get the fcPlcffldEdn field for the FIB record.
-     */
-    public int getFcPlcffldEdn()
-    {
-        return field_150_fcPlcffldEdn;
-    }
-
-    /**
-     * Set the fcPlcffldEdn field for the FIB record.
-     */
-    public void setFcPlcffldEdn(int field_150_fcPlcffldEdn)
-    {
-        this.field_150_fcPlcffldEdn = field_150_fcPlcffldEdn;
-    }
-
-    /**
-     * Get the lcbPlcffldEdn field for the FIB record.
-     */
-    public int getLcbPlcffldEdn()
-    {
-        return field_151_lcbPlcffldEdn;
-    }
-
-    /**
-     * Set the lcbPlcffldEdn field for the FIB record.
-     */
-    public void setLcbPlcffldEdn(int field_151_lcbPlcffldEdn)
-    {
-        this.field_151_lcbPlcffldEdn = field_151_lcbPlcffldEdn;
-    }
-
-    /**
-     * Get the fcPlcfpgdEdn field for the FIB record.
-     */
-    public int getFcPlcfpgdEdn()
-    {
-        return field_152_fcPlcfpgdEdn;
-    }
-
-    /**
-     * Set the fcPlcfpgdEdn field for the FIB record.
-     */
-    public void setFcPlcfpgdEdn(int field_152_fcPlcfpgdEdn)
-    {
-        this.field_152_fcPlcfpgdEdn = field_152_fcPlcfpgdEdn;
-    }
-
-    /**
-     * Get the lcbPlcfpgdEdn field for the FIB record.
-     */
-    public int getLcbPlcfpgdEdn()
-    {
-        return field_153_lcbPlcfpgdEdn;
-    }
-
-    /**
-     * Set the lcbPlcfpgdEdn field for the FIB record.
-     */
-    public void setLcbPlcfpgdEdn(int field_153_lcbPlcfpgdEdn)
-    {
-        this.field_153_lcbPlcfpgdEdn = field_153_lcbPlcfpgdEdn;
-    }
-
-    /**
-     * Get the fcDggInfo field for the FIB record.
-     */
-    public int getFcDggInfo()
-    {
-        return field_154_fcDggInfo;
-    }
-
-    /**
-     * Set the fcDggInfo field for the FIB record.
-     */
-    public void setFcDggInfo(int field_154_fcDggInfo)
-    {
-        this.field_154_fcDggInfo = field_154_fcDggInfo;
-    }
-
-    /**
-     * Get the lcbDggInfo field for the FIB record.
-     */
-    public int getLcbDggInfo()
-    {
-        return field_155_lcbDggInfo;
-    }
-
-    /**
-     * Set the lcbDggInfo field for the FIB record.
-     */
-    public void setLcbDggInfo(int field_155_lcbDggInfo)
-    {
-        this.field_155_lcbDggInfo = field_155_lcbDggInfo;
-    }
-
-    /**
-     * Get the fcSttbfRMark field for the FIB record.
-     */
-    public int getFcSttbfRMark()
-    {
-        return field_156_fcSttbfRMark;
-    }
-
-    /**
-     * Set the fcSttbfRMark field for the FIB record.
-     */
-    public void setFcSttbfRMark(int field_156_fcSttbfRMark)
-    {
-        this.field_156_fcSttbfRMark = field_156_fcSttbfRMark;
-    }
-
-    /**
-     * Get the lcbSttbfRMark field for the FIB record.
-     */
-    public int getLcbSttbfRMark()
-    {
-        return field_157_lcbSttbfRMark;
-    }
-
-    /**
-     * Set the lcbSttbfRMark field for the FIB record.
-     */
-    public void setLcbSttbfRMark(int field_157_lcbSttbfRMark)
-    {
-        this.field_157_lcbSttbfRMark = field_157_lcbSttbfRMark;
-    }
-
-    /**
-     * Get the fcSttbCaption field for the FIB record.
-     */
-    public int getFcSttbCaption()
-    {
-        return field_158_fcSttbCaption;
-    }
-
-    /**
-     * Set the fcSttbCaption field for the FIB record.
-     */
-    public void setFcSttbCaption(int field_158_fcSttbCaption)
-    {
-        this.field_158_fcSttbCaption = field_158_fcSttbCaption;
-    }
-
-    /**
-     * Get the lcbSttbCaption field for the FIB record.
-     */
-    public int getLcbSttbCaption()
-    {
-        return field_159_lcbSttbCaption;
-    }
-
-    /**
-     * Set the lcbSttbCaption field for the FIB record.
-     */
-    public void setLcbSttbCaption(int field_159_lcbSttbCaption)
-    {
-        this.field_159_lcbSttbCaption = field_159_lcbSttbCaption;
-    }
-
-    /**
-     * Get the fcSttbAutoCaption field for the FIB record.
-     */
-    public int getFcSttbAutoCaption()
-    {
-        return field_160_fcSttbAutoCaption;
-    }
-
-    /**
-     * Set the fcSttbAutoCaption field for the FIB record.
-     */
-    public void setFcSttbAutoCaption(int field_160_fcSttbAutoCaption)
-    {
-        this.field_160_fcSttbAutoCaption = field_160_fcSttbAutoCaption;
-    }
-
-    /**
-     * Get the lcbSttbAutoCaption field for the FIB record.
-     */
-    public int getLcbSttbAutoCaption()
-    {
-        return field_161_lcbSttbAutoCaption;
-    }
-
-    /**
-     * Set the lcbSttbAutoCaption field for the FIB record.
-     */
-    public void setLcbSttbAutoCaption(int field_161_lcbSttbAutoCaption)
-    {
-        this.field_161_lcbSttbAutoCaption = field_161_lcbSttbAutoCaption;
-    }
-
-    /**
-     * Get the fcPlcfwkb field for the FIB record.
-     */
-    public int getFcPlcfwkb()
-    {
-        return field_162_fcPlcfwkb;
-    }
-
-    /**
-     * Set the fcPlcfwkb field for the FIB record.
-     */
-    public void setFcPlcfwkb(int field_162_fcPlcfwkb)
-    {
-        this.field_162_fcPlcfwkb = field_162_fcPlcfwkb;
-    }
-
-    /**
-     * Get the lcbPlcfwkb field for the FIB record.
-     */
-    public int getLcbPlcfwkb()
-    {
-        return field_163_lcbPlcfwkb;
-    }
-
-    /**
-     * Set the lcbPlcfwkb field for the FIB record.
-     */
-    public void setLcbPlcfwkb(int field_163_lcbPlcfwkb)
-    {
-        this.field_163_lcbPlcfwkb = field_163_lcbPlcfwkb;
-    }
-
-    /**
-     * Get the fcPlcfspl field for the FIB record.
-     */
-    public int getFcPlcfspl()
-    {
-        return field_164_fcPlcfspl;
-    }
-
-    /**
-     * Set the fcPlcfspl field for the FIB record.
-     */
-    public void setFcPlcfspl(int field_164_fcPlcfspl)
-    {
-        this.field_164_fcPlcfspl = field_164_fcPlcfspl;
-    }
-
-    /**
-     * Get the lcbPlcfspl field for the FIB record.
-     */
-    public int getLcbPlcfspl()
-    {
-        return field_165_lcbPlcfspl;
-    }
-
-    /**
-     * Set the lcbPlcfspl field for the FIB record.
-     */
-    public void setLcbPlcfspl(int field_165_lcbPlcfspl)
-    {
-        this.field_165_lcbPlcfspl = field_165_lcbPlcfspl;
-    }
-
-    /**
-     * Get the fcPlcftxbxTxt field for the FIB record.
-     */
-    public int getFcPlcftxbxTxt()
-    {
-        return field_166_fcPlcftxbxTxt;
-    }
-
-    /**
-     * Set the fcPlcftxbxTxt field for the FIB record.
-     */
-    public void setFcPlcftxbxTxt(int field_166_fcPlcftxbxTxt)
-    {
-        this.field_166_fcPlcftxbxTxt = field_166_fcPlcftxbxTxt;
-    }
-
-    /**
-     * Get the lcbPlcftxbxTxt field for the FIB record.
-     */
-    public int getLcbPlcftxbxTxt()
-    {
-        return field_167_lcbPlcftxbxTxt;
-    }
-
-    /**
-     * Set the lcbPlcftxbxTxt field for the FIB record.
-     */
-    public void setLcbPlcftxbxTxt(int field_167_lcbPlcftxbxTxt)
-    {
-        this.field_167_lcbPlcftxbxTxt = field_167_lcbPlcftxbxTxt;
-    }
-
-    /**
-     * Get the fcPlcffldTxbx field for the FIB record.
-     */
-    public int getFcPlcffldTxbx()
-    {
-        return field_168_fcPlcffldTxbx;
-    }
-
-    /**
-     * Set the fcPlcffldTxbx field for the FIB record.
-     */
-    public void setFcPlcffldTxbx(int field_168_fcPlcffldTxbx)
-    {
-        this.field_168_fcPlcffldTxbx = field_168_fcPlcffldTxbx;
-    }
-
-    /**
-     * Get the lcbPlcffldTxbx field for the FIB record.
-     */
-    public int getLcbPlcffldTxbx()
-    {
-        return field_169_lcbPlcffldTxbx;
-    }
-
-    /**
-     * Set the lcbPlcffldTxbx field for the FIB record.
-     */
-    public void setLcbPlcffldTxbx(int field_169_lcbPlcffldTxbx)
-    {
-        this.field_169_lcbPlcffldTxbx = field_169_lcbPlcffldTxbx;
-    }
-
-    /**
-     * Get the fcPlcfhdrtxbxTxt field for the FIB record.
-     */
-    public int getFcPlcfhdrtxbxTxt()
-    {
-        return field_170_fcPlcfhdrtxbxTxt;
-    }
-
-    /**
-     * Set the fcPlcfhdrtxbxTxt field for the FIB record.
-     */
-    public void setFcPlcfhdrtxbxTxt(int field_170_fcPlcfhdrtxbxTxt)
-    {
-        this.field_170_fcPlcfhdrtxbxTxt = field_170_fcPlcfhdrtxbxTxt;
-    }
-
-    /**
-     * Get the lcbPlcfhdrtxbxTxt field for the FIB record.
-     */
-    public int getLcbPlcfhdrtxbxTxt()
-    {
-        return field_171_lcbPlcfhdrtxbxTxt;
-    }
-
-    /**
-     * Set the lcbPlcfhdrtxbxTxt field for the FIB record.
-     */
-    public void setLcbPlcfhdrtxbxTxt(int field_171_lcbPlcfhdrtxbxTxt)
-    {
-        this.field_171_lcbPlcfhdrtxbxTxt = field_171_lcbPlcfhdrtxbxTxt;
-    }
-
-    /**
-     * Get the fcPlcffldHdrTxbx field for the FIB record.
-     */
-    public int getFcPlcffldHdrTxbx()
-    {
-        return field_172_fcPlcffldHdrTxbx;
-    }
-
-    /**
-     * Set the fcPlcffldHdrTxbx field for the FIB record.
-     */
-    public void setFcPlcffldHdrTxbx(int field_172_fcPlcffldHdrTxbx)
-    {
-        this.field_172_fcPlcffldHdrTxbx = field_172_fcPlcffldHdrTxbx;
-    }
-
-    /**
-     * Get the lcbPlcffldHdrTxbx field for the FIB record.
-     */
-    public int getLcbPlcffldHdrTxbx()
-    {
-        return field_173_lcbPlcffldHdrTxbx;
-    }
-
-    /**
-     * Set the lcbPlcffldHdrTxbx field for the FIB record.
-     */
-    public void setLcbPlcffldHdrTxbx(int field_173_lcbPlcffldHdrTxbx)
-    {
-        this.field_173_lcbPlcffldHdrTxbx = field_173_lcbPlcffldHdrTxbx;
-    }
-
-    /**
-     * Get the fcStwUser field for the FIB record.
-     */
-    public int getFcStwUser()
-    {
-        return field_174_fcStwUser;
-    }
-
-    /**
-     * Set the fcStwUser field for the FIB record.
-     */
-    public void setFcStwUser(int field_174_fcStwUser)
-    {
-        this.field_174_fcStwUser = field_174_fcStwUser;
-    }
-
-    /**
-     * Get the lcbStwUser field for the FIB record.
-     */
-    public int getLcbStwUser()
-    {
-        return field_175_lcbStwUser;
-    }
-
-    /**
-     * Set the lcbStwUser field for the FIB record.
-     */
-    public void setLcbStwUser(int field_175_lcbStwUser)
-    {
-        this.field_175_lcbStwUser = field_175_lcbStwUser;
-    }
-
-    /**
-     * Get the fcSttbttmbd field for the FIB record.
-     */
-    public int getFcSttbttmbd()
-    {
-        return field_176_fcSttbttmbd;
-    }
-
-    /**
-     * Set the fcSttbttmbd field for the FIB record.
-     */
-    public void setFcSttbttmbd(int field_176_fcSttbttmbd)
-    {
-        this.field_176_fcSttbttmbd = field_176_fcSttbttmbd;
-    }
-
-    /**
-     * Get the cbSttbttmbd field for the FIB record.
-     */
-    public int getCbSttbttmbd()
-    {
-        return field_177_cbSttbttmbd;
-    }
-
-    /**
-     * Set the cbSttbttmbd field for the FIB record.
-     */
-    public void setCbSttbttmbd(int field_177_cbSttbttmbd)
-    {
-        this.field_177_cbSttbttmbd = field_177_cbSttbttmbd;
-    }
-
-    /**
-     * Get the fcUnused field for the FIB record.
-     */
-    public int getFcUnused()
-    {
-        return field_178_fcUnused;
-    }
-
-    /**
-     * Set the fcUnused field for the FIB record.
-     */
-    public void setFcUnused(int field_178_fcUnused)
-    {
-        this.field_178_fcUnused = field_178_fcUnused;
-    }
-
-    /**
-     * Get the lcbUnused field for the FIB record.
-     */
-    public int getLcbUnused()
-    {
-        return field_179_lcbUnused;
-    }
-
-    /**
-     * Set the lcbUnused field for the FIB record.
-     */
-    public void setLcbUnused(int field_179_lcbUnused)
-    {
-        this.field_179_lcbUnused = field_179_lcbUnused;
-    }
-
-    /**
-     * Get the fcPgdMother field for the FIB record.
-     */
-    public int getFcPgdMother()
-    {
-        return field_180_fcPgdMother;
-    }
-
-    /**
-     * Set the fcPgdMother field for the FIB record.
-     */
-    public void setFcPgdMother(int field_180_fcPgdMother)
-    {
-        this.field_180_fcPgdMother = field_180_fcPgdMother;
-    }
-
-    /**
-     * Get the lcbPgdMother field for the FIB record.
-     */
-    public int getLcbPgdMother()
-    {
-        return field_181_lcbPgdMother;
-    }
-
-    /**
-     * Set the lcbPgdMother field for the FIB record.
-     */
-    public void setLcbPgdMother(int field_181_lcbPgdMother)
-    {
-        this.field_181_lcbPgdMother = field_181_lcbPgdMother;
-    }
-
-    /**
-     * Get the fcBkdMother field for the FIB record.
-     */
-    public int getFcBkdMother()
-    {
-        return field_182_fcBkdMother;
-    }
-
-    /**
-     * Set the fcBkdMother field for the FIB record.
-     */
-    public void setFcBkdMother(int field_182_fcBkdMother)
-    {
-        this.field_182_fcBkdMother = field_182_fcBkdMother;
-    }
-
-    /**
-     * Get the lcbBkdMother field for the FIB record.
-     */
-    public int getLcbBkdMother()
-    {
-        return field_183_lcbBkdMother;
-    }
-
-    /**
-     * Set the lcbBkdMother field for the FIB record.
-     */
-    public void setLcbBkdMother(int field_183_lcbBkdMother)
-    {
-        this.field_183_lcbBkdMother = field_183_lcbBkdMother;
-    }
-
-    /**
-     * Get the fcPgdFtn field for the FIB record.
-     */
-    public int getFcPgdFtn()
-    {
-        return field_184_fcPgdFtn;
-    }
-
-    /**
-     * Set the fcPgdFtn field for the FIB record.
-     */
-    public void setFcPgdFtn(int field_184_fcPgdFtn)
-    {
-        this.field_184_fcPgdFtn = field_184_fcPgdFtn;
-    }
-
-    /**
-     * Get the lcbPgdFtn field for the FIB record.
-     */
-    public int getLcbPgdFtn()
-    {
-        return field_185_lcbPgdFtn;
-    }
-
-    /**
-     * Set the lcbPgdFtn field for the FIB record.
-     */
-    public void setLcbPgdFtn(int field_185_lcbPgdFtn)
-    {
-        this.field_185_lcbPgdFtn = field_185_lcbPgdFtn;
-    }
-
-    /**
-     * Get the fcBkdFtn field for the FIB record.
-     */
-    public int getFcBkdFtn()
-    {
-        return field_186_fcBkdFtn;
-    }
-
-    /**
-     * Set the fcBkdFtn field for the FIB record.
-     */
-    public void setFcBkdFtn(int field_186_fcBkdFtn)
-    {
-        this.field_186_fcBkdFtn = field_186_fcBkdFtn;
-    }
-
-    /**
-     * Get the lcbBkdFtn field for the FIB record.
-     */
-    public int getLcbBkdFtn()
-    {
-        return field_187_lcbBkdFtn;
-    }
-
-    /**
-     * Set the lcbBkdFtn field for the FIB record.
-     */
-    public void setLcbBkdFtn(int field_187_lcbBkdFtn)
-    {
-        this.field_187_lcbBkdFtn = field_187_lcbBkdFtn;
-    }
-
-    /**
-     * Get the fcPgdEdn field for the FIB record.
-     */
-    public int getFcPgdEdn()
-    {
-        return field_188_fcPgdEdn;
-    }
-
-    /**
-     * Set the fcPgdEdn field for the FIB record.
-     */
-    public void setFcPgdEdn(int field_188_fcPgdEdn)
-    {
-        this.field_188_fcPgdEdn = field_188_fcPgdEdn;
-    }
-
-    /**
-     * Get the lcbPgdEdn field for the FIB record.
-     */
-    public int getLcbPgdEdn()
-    {
-        return field_189_lcbPgdEdn;
-    }
-
-    /**
-     * Set the lcbPgdEdn field for the FIB record.
-     */
-    public void setLcbPgdEdn(int field_189_lcbPgdEdn)
-    {
-        this.field_189_lcbPgdEdn = field_189_lcbPgdEdn;
-    }
-
-    /**
-     * Get the fcBkdEdn field for the FIB record.
-     */
-    public int getFcBkdEdn()
-    {
-        return field_190_fcBkdEdn;
-    }
-
-    /**
-     * Set the fcBkdEdn field for the FIB record.
-     */
-    public void setFcBkdEdn(int field_190_fcBkdEdn)
-    {
-        this.field_190_fcBkdEdn = field_190_fcBkdEdn;
-    }
-
-    /**
-     * Get the lcbBkdEdn field for the FIB record.
-     */
-    public int getLcbBkdEdn()
-    {
-        return field_191_lcbBkdEdn;
-    }
-
-    /**
-     * Set the lcbBkdEdn field for the FIB record.
-     */
-    public void setLcbBkdEdn(int field_191_lcbBkdEdn)
-    {
-        this.field_191_lcbBkdEdn = field_191_lcbBkdEdn;
-    }
-
-    /**
-     * Get the fcSttbfIntlFld field for the FIB record.
-     */
-    public int getFcSttbfIntlFld()
-    {
-        return field_192_fcSttbfIntlFld;
-    }
-
-    /**
-     * Set the fcSttbfIntlFld field for the FIB record.
-     */
-    public void setFcSttbfIntlFld(int field_192_fcSttbfIntlFld)
-    {
-        this.field_192_fcSttbfIntlFld = field_192_fcSttbfIntlFld;
-    }
-
-    /**
-     * Get the lcbSttbfIntlFld field for the FIB record.
-     */
-    public int getLcbSttbfIntlFld()
-    {
-        return field_193_lcbSttbfIntlFld;
-    }
-
-    /**
-     * Set the lcbSttbfIntlFld field for the FIB record.
-     */
-    public void setLcbSttbfIntlFld(int field_193_lcbSttbfIntlFld)
-    {
-        this.field_193_lcbSttbfIntlFld = field_193_lcbSttbfIntlFld;
-    }
-
-    /**
-     * Get the fcRouteSlip field for the FIB record.
-     */
-    public int getFcRouteSlip()
-    {
-        return field_194_fcRouteSlip;
-    }
-
-    /**
-     * Set the fcRouteSlip field for the FIB record.
-     */
-    public void setFcRouteSlip(int field_194_fcRouteSlip)
-    {
-        this.field_194_fcRouteSlip = field_194_fcRouteSlip;
-    }
-
-    /**
-     * Get the lcbRouteSlip field for the FIB record.
-     */
-    public int getLcbRouteSlip()
-    {
-        return field_195_lcbRouteSlip;
-    }
-
-    /**
-     * Set the lcbRouteSlip field for the FIB record.
-     */
-    public void setLcbRouteSlip(int field_195_lcbRouteSlip)
-    {
-        this.field_195_lcbRouteSlip = field_195_lcbRouteSlip;
-    }
-
-    /**
-     * Get the fcSttbSavedBy field for the FIB record.
-     */
-    public int getFcSttbSavedBy()
-    {
-        return field_196_fcSttbSavedBy;
-    }
-
-    /**
-     * Set the fcSttbSavedBy field for the FIB record.
-     */
-    public void setFcSttbSavedBy(int field_196_fcSttbSavedBy)
-    {
-        this.field_196_fcSttbSavedBy = field_196_fcSttbSavedBy;
-    }
-
-    /**
-     * Get the lcbSttbSavedBy field for the FIB record.
-     */
-    public int getLcbSttbSavedBy()
-    {
-        return field_197_lcbSttbSavedBy;
-    }
-
-    /**
-     * Set the lcbSttbSavedBy field for the FIB record.
-     */
-    public void setLcbSttbSavedBy(int field_197_lcbSttbSavedBy)
-    {
-        this.field_197_lcbSttbSavedBy = field_197_lcbSttbSavedBy;
-    }
-
-    /**
-     * Get the fcSttbFnm field for the FIB record.
-     */
-    public int getFcSttbFnm()
-    {
-        return field_198_fcSttbFnm;
-    }
-
-    /**
-     * Set the fcSttbFnm field for the FIB record.
-     */
-    public void setFcSttbFnm(int field_198_fcSttbFnm)
-    {
-        this.field_198_fcSttbFnm = field_198_fcSttbFnm;
-    }
-
-    /**
-     * Get the lcbSttbFnm field for the FIB record.
-     */
-    public int getLcbSttbFnm()
-    {
-        return field_199_lcbSttbFnm;
-    }
-
-    /**
-     * Set the lcbSttbFnm field for the FIB record.
-     */
-    public void setLcbSttbFnm(int field_199_lcbSttbFnm)
-    {
-        this.field_199_lcbSttbFnm = field_199_lcbSttbFnm;
-    }
-
-    /**
-     * Get the fcPlcfLst field for the FIB record.
-     */
-    public int getFcPlcfLst()
-    {
-        return field_200_fcPlcfLst;
-    }
-
-    /**
-     * Set the fcPlcfLst field for the FIB record.
-     */
-    public void setFcPlcfLst(int field_200_fcPlcfLst)
-    {
-        this.field_200_fcPlcfLst = field_200_fcPlcfLst;
-    }
-
-    /**
-     * Get the lcbPlcfLst field for the FIB record.
-     */
-    public int getLcbPlcfLst()
-    {
-        return field_201_lcbPlcfLst;
-    }
-
-    /**
-     * Set the lcbPlcfLst field for the FIB record.
-     */
-    public void setLcbPlcfLst(int field_201_lcbPlcfLst)
-    {
-        this.field_201_lcbPlcfLst = field_201_lcbPlcfLst;
-    }
-
-    /**
-     * Get the fcPlfLfo field for the FIB record.
-     */
-    public int getFcPlfLfo()
-    {
-        return field_202_fcPlfLfo;
-    }
-
-    /**
-     * Set the fcPlfLfo field for the FIB record.
-     */
-    public void setFcPlfLfo(int field_202_fcPlfLfo)
-    {
-        this.field_202_fcPlfLfo = field_202_fcPlfLfo;
-    }
-
-    /**
-     * Get the lcbPlfLfo field for the FIB record.
-     */
-    public int getLcbPlfLfo()
-    {
-        return field_203_lcbPlfLfo;
-    }
-
-    /**
-     * Set the lcbPlfLfo field for the FIB record.
-     */
-    public void setLcbPlfLfo(int field_203_lcbPlfLfo)
-    {
-        this.field_203_lcbPlfLfo = field_203_lcbPlfLfo;
-    }
-
-    /**
-     * Get the fcPlcftxbxBkd field for the FIB record.
-     */
-    public int getFcPlcftxbxBkd()
-    {
-        return field_204_fcPlcftxbxBkd;
-    }
-
-    /**
-     * Set the fcPlcftxbxBkd field for the FIB record.
-     */
-    public void setFcPlcftxbxBkd(int field_204_fcPlcftxbxBkd)
-    {
-        this.field_204_fcPlcftxbxBkd = field_204_fcPlcftxbxBkd;
-    }
-
-    /**
-     * Get the lcbPlcftxbxBkd field for the FIB record.
-     */
-    public int getLcbPlcftxbxBkd()
-    {
-        return field_205_lcbPlcftxbxBkd;
-    }
-
-    /**
-     * Set the lcbPlcftxbxBkd field for the FIB record.
-     */
-    public void setLcbPlcftxbxBkd(int field_205_lcbPlcftxbxBkd)
-    {
-        this.field_205_lcbPlcftxbxBkd = field_205_lcbPlcftxbxBkd;
-    }
-
-    /**
-     * Get the fcPlcftxbxHdrBkd field for the FIB record.
-     */
-    public int getFcPlcftxbxHdrBkd()
-    {
-        return field_206_fcPlcftxbxHdrBkd;
-    }
-
-    /**
-     * Set the fcPlcftxbxHdrBkd field for the FIB record.
-     */
-    public void setFcPlcftxbxHdrBkd(int field_206_fcPlcftxbxHdrBkd)
-    {
-        this.field_206_fcPlcftxbxHdrBkd = field_206_fcPlcftxbxHdrBkd;
-    }
-
-    /**
-     * Get the lcbPlcftxbxHdrBkd field for the FIB record.
-     */
-    public int getLcbPlcftxbxHdrBkd()
-    {
-        return field_207_lcbPlcftxbxHdrBkd;
-    }
-
-    /**
-     * Set the lcbPlcftxbxHdrBkd field for the FIB record.
-     */
-    public void setLcbPlcftxbxHdrBkd(int field_207_lcbPlcftxbxHdrBkd)
-    {
-        this.field_207_lcbPlcftxbxHdrBkd = field_207_lcbPlcftxbxHdrBkd;
-    }
-
-    /**
-     * Get the fcDocUndo field for the FIB record.
-     */
-    public int getFcDocUndo()
-    {
-        return field_208_fcDocUndo;
-    }
-
-    /**
-     * Set the fcDocUndo field for the FIB record.
-     */
-    public void setFcDocUndo(int field_208_fcDocUndo)
-    {
-        this.field_208_fcDocUndo = field_208_fcDocUndo;
-    }
-
-    /**
-     * Get the lcbDocUndo field for the FIB record.
-     */
-    public int getLcbDocUndo()
-    {
-        return field_209_lcbDocUndo;
-    }
-
-    /**
-     * Set the lcbDocUndo field for the FIB record.
-     */
-    public void setLcbDocUndo(int field_209_lcbDocUndo)
-    {
-        this.field_209_lcbDocUndo = field_209_lcbDocUndo;
-    }
-
-    /**
-     * Get the fcRgbuse field for the FIB record.
-     */
-    public int getFcRgbuse()
-    {
-        return field_210_fcRgbuse;
-    }
-
-    /**
-     * Set the fcRgbuse field for the FIB record.
-     */
-    public void setFcRgbuse(int field_210_fcRgbuse)
-    {
-        this.field_210_fcRgbuse = field_210_fcRgbuse;
-    }
-
-    /**
-     * Get the lcbRgbuse field for the FIB record.
-     */
-    public int getLcbRgbuse()
-    {
-        return field_211_lcbRgbuse;
-    }
-
-    /**
-     * Set the lcbRgbuse field for the FIB record.
-     */
-    public void setLcbRgbuse(int field_211_lcbRgbuse)
-    {
-        this.field_211_lcbRgbuse = field_211_lcbRgbuse;
-    }
-
-    /**
-     * Get the fcUsp field for the FIB record.
-     */
-    public int getFcUsp()
-    {
-        return field_212_fcUsp;
-    }
-
-    /**
-     * Set the fcUsp field for the FIB record.
-     */
-    public void setFcUsp(int field_212_fcUsp)
-    {
-        this.field_212_fcUsp = field_212_fcUsp;
-    }
-
-    /**
-     * Get the lcbUsp field for the FIB record.
-     */
-    public int getLcbUsp()
-    {
-        return field_213_lcbUsp;
-    }
-
-    /**
-     * Set the lcbUsp field for the FIB record.
-     */
-    public void setLcbUsp(int field_213_lcbUsp)
-    {
-        this.field_213_lcbUsp = field_213_lcbUsp;
-    }
-
-    /**
-     * Get the fcUskf field for the FIB record.
-     */
-    public int getFcUskf()
-    {
-        return field_214_fcUskf;
-    }
-
-    /**
-     * Set the fcUskf field for the FIB record.
-     */
-    public void setFcUskf(int field_214_fcUskf)
-    {
-        this.field_214_fcUskf = field_214_fcUskf;
-    }
-
-    /**
-     * Get the lcbUskf field for the FIB record.
-     */
-    public int getLcbUskf()
-    {
-        return field_215_lcbUskf;
-    }
-
-    /**
-     * Set the lcbUskf field for the FIB record.
-     */
-    public void setLcbUskf(int field_215_lcbUskf)
-    {
-        this.field_215_lcbUskf = field_215_lcbUskf;
-    }
-
-    /**
-     * Get the fcPlcupcRgbuse field for the FIB record.
-     */
-    public int getFcPlcupcRgbuse()
-    {
-        return field_216_fcPlcupcRgbuse;
-    }
-
-    /**
-     * Set the fcPlcupcRgbuse field for the FIB record.
-     */
-    public void setFcPlcupcRgbuse(int field_216_fcPlcupcRgbuse)
-    {
-        this.field_216_fcPlcupcRgbuse = field_216_fcPlcupcRgbuse;
-    }
-
-    /**
-     * Get the lcbPlcupcRgbuse field for the FIB record.
-     */
-    public int getLcbPlcupcRgbuse()
-    {
-        return field_217_lcbPlcupcRgbuse;
-    }
-
-    /**
-     * Set the lcbPlcupcRgbuse field for the FIB record.
-     */
-    public void setLcbPlcupcRgbuse(int field_217_lcbPlcupcRgbuse)
-    {
-        this.field_217_lcbPlcupcRgbuse = field_217_lcbPlcupcRgbuse;
-    }
-
-    /**
-     * Get the fcPlcupcUsp field for the FIB record.
-     */
-    public int getFcPlcupcUsp()
-    {
-        return field_218_fcPlcupcUsp;
-    }
-
-    /**
-     * Set the fcPlcupcUsp field for the FIB record.
-     */
-    public void setFcPlcupcUsp(int field_218_fcPlcupcUsp)
-    {
-        this.field_218_fcPlcupcUsp = field_218_fcPlcupcUsp;
-    }
-
-    /**
-     * Get the lcbPlcupcUsp field for the FIB record.
-     */
-    public int getLcbPlcupcUsp()
-    {
-        return field_219_lcbPlcupcUsp;
-    }
-
-    /**
-     * Set the lcbPlcupcUsp field for the FIB record.
-     */
-    public void setLcbPlcupcUsp(int field_219_lcbPlcupcUsp)
-    {
-        this.field_219_lcbPlcupcUsp = field_219_lcbPlcupcUsp;
-    }
-
-    /**
-     * Get the fcSttbGlsyStyle field for the FIB record.
-     */
-    public int getFcSttbGlsyStyle()
-    {
-        return field_220_fcSttbGlsyStyle;
-    }
-
-    /**
-     * Set the fcSttbGlsyStyle field for the FIB record.
-     */
-    public void setFcSttbGlsyStyle(int field_220_fcSttbGlsyStyle)
-    {
-        this.field_220_fcSttbGlsyStyle = field_220_fcSttbGlsyStyle;
-    }
-
-    /**
-     * Get the lcbSttbGlsyStyle field for the FIB record.
-     */
-    public int getLcbSttbGlsyStyle()
-    {
-        return field_221_lcbSttbGlsyStyle;
-    }
-
-    /**
-     * Set the lcbSttbGlsyStyle field for the FIB record.
-     */
-    public void setLcbSttbGlsyStyle(int field_221_lcbSttbGlsyStyle)
-    {
-        this.field_221_lcbSttbGlsyStyle = field_221_lcbSttbGlsyStyle;
-    }
-
-    /**
-     * Get the fcPlgosl field for the FIB record.
-     */
-    public int getFcPlgosl()
-    {
-        return field_222_fcPlgosl;
-    }
-
-    /**
-     * Set the fcPlgosl field for the FIB record.
-     */
-    public void setFcPlgosl(int field_222_fcPlgosl)
-    {
-        this.field_222_fcPlgosl = field_222_fcPlgosl;
-    }
-
-    /**
-     * Get the lcbPlgosl field for the FIB record.
-     */
-    public int getLcbPlgosl()
-    {
-        return field_223_lcbPlgosl;
-    }
-
-    /**
-     * Set the lcbPlgosl field for the FIB record.
-     */
-    public void setLcbPlgosl(int field_223_lcbPlgosl)
-    {
-        this.field_223_lcbPlgosl = field_223_lcbPlgosl;
-    }
-
-    /**
-     * Get the fcPlcocx field for the FIB record.
-     */
-    public int getFcPlcocx()
-    {
-        return field_224_fcPlcocx;
-    }
-
-    /**
-     * Set the fcPlcocx field for the FIB record.
-     */
-    public void setFcPlcocx(int field_224_fcPlcocx)
-    {
-        this.field_224_fcPlcocx = field_224_fcPlcocx;
-    }
-
-    /**
-     * Get the lcbPlcocx field for the FIB record.
-     */
-    public int getLcbPlcocx()
-    {
-        return field_225_lcbPlcocx;
-    }
-
-    /**
-     * Set the lcbPlcocx field for the FIB record.
-     */
-    public void setLcbPlcocx(int field_225_lcbPlcocx)
-    {
-        this.field_225_lcbPlcocx = field_225_lcbPlcocx;
-    }
-
-    /**
-     * Get the fcPlcfbteLvc field for the FIB record.
-     */
-    public int getFcPlcfbteLvc()
-    {
-        return field_226_fcPlcfbteLvc;
-    }
-
-    /**
-     * Set the fcPlcfbteLvc field for the FIB record.
-     */
-    public void setFcPlcfbteLvc(int field_226_fcPlcfbteLvc)
-    {
-        this.field_226_fcPlcfbteLvc = field_226_fcPlcfbteLvc;
-    }
-
-    /**
-     * Get the lcbPlcfbteLvc field for the FIB record.
-     */
-    public int getLcbPlcfbteLvc()
-    {
-        return field_227_lcbPlcfbteLvc;
-    }
-
-    /**
-     * Set the lcbPlcfbteLvc field for the FIB record.
-     */
-    public void setLcbPlcfbteLvc(int field_227_lcbPlcfbteLvc)
-    {
-        this.field_227_lcbPlcfbteLvc = field_227_lcbPlcfbteLvc;
-    }
-
-    /**
-     * Get the dwLowDateTime field for the FIB record.
-     */
-    public int getDwLowDateTime()
-    {
-        return field_228_dwLowDateTime;
-    }
-
-    /**
-     * Set the dwLowDateTime field for the FIB record.
-     */
-    public void setDwLowDateTime(int field_228_dwLowDateTime)
-    {
-        this.field_228_dwLowDateTime = field_228_dwLowDateTime;
-    }
-
-    /**
-     * Get the dwHighDateTime field for the FIB record.
-     */
-    public int getDwHighDateTime()
-    {
-        return field_229_dwHighDateTime;
-    }
-
-    /**
-     * Set the dwHighDateTime field for the FIB record.
-     */
-    public void setDwHighDateTime(int field_229_dwHighDateTime)
-    {
-        this.field_229_dwHighDateTime = field_229_dwHighDateTime;
-    }
-
-    /**
-     * Get the fcPlcflvc field for the FIB record.
-     */
-    public int getFcPlcflvc()
-    {
-        return field_230_fcPlcflvc;
-    }
-
-    /**
-     * Set the fcPlcflvc field for the FIB record.
-     */
-    public void setFcPlcflvc(int field_230_fcPlcflvc)
-    {
-        this.field_230_fcPlcflvc = field_230_fcPlcflvc;
-    }
-
-    /**
-     * Get the lcbPlcflvc field for the FIB record.
-     */
-    public int getLcbPlcflvc()
-    {
-        return field_231_lcbPlcflvc;
-    }
-
-    /**
-     * Set the lcbPlcflvc field for the FIB record.
-     */
-    public void setLcbPlcflvc(int field_231_lcbPlcflvc)
-    {
-        this.field_231_lcbPlcflvc = field_231_lcbPlcflvc;
-    }
-
-    /**
-     * Get the fcPlcasumy field for the FIB record.
-     */
-    public int getFcPlcasumy()
-    {
-        return field_232_fcPlcasumy;
-    }
-
-    /**
-     * Set the fcPlcasumy field for the FIB record.
-     */
-    public void setFcPlcasumy(int field_232_fcPlcasumy)
-    {
-        this.field_232_fcPlcasumy = field_232_fcPlcasumy;
-    }
-
-    /**
-     * Get the lcbPlcasumy field for the FIB record.
-     */
-    public int getLcbPlcasumy()
-    {
-        return field_233_lcbPlcasumy;
-    }
-
-    /**
-     * Set the lcbPlcasumy field for the FIB record.
-     */
-    public void setLcbPlcasumy(int field_233_lcbPlcasumy)
-    {
-        this.field_233_lcbPlcasumy = field_233_lcbPlcasumy;
-    }
-
-    /**
-     * Get the fcPlcfgram field for the FIB record.
-     */
-    public int getFcPlcfgram()
-    {
-        return field_234_fcPlcfgram;
-    }
-
-    /**
-     * Set the fcPlcfgram field for the FIB record.
-     */
-    public void setFcPlcfgram(int field_234_fcPlcfgram)
-    {
-        this.field_234_fcPlcfgram = field_234_fcPlcfgram;
-    }
-
-    /**
-     * Get the lcbPlcfgram field for the FIB record.
-     */
-    public int getLcbPlcfgram()
-    {
-        return field_235_lcbPlcfgram;
-    }
-
-    /**
-     * Set the lcbPlcfgram field for the FIB record.
-     */
-    public void setLcbPlcfgram(int field_235_lcbPlcfgram)
-    {
-        this.field_235_lcbPlcfgram = field_235_lcbPlcfgram;
-    }
-
-    /**
-     * Get the fcSttbListNames field for the FIB record.
-     */
-    public int getFcSttbListNames()
-    {
-        return field_236_fcSttbListNames;
-    }
-
-    /**
-     * Set the fcSttbListNames field for the FIB record.
-     */
-    public void setFcSttbListNames(int field_236_fcSttbListNames)
-    {
-        this.field_236_fcSttbListNames = field_236_fcSttbListNames;
-    }
-
-    /**
-     * Get the lcbSttbListNames field for the FIB record.
-     */
-    public int getLcbSttbListNames()
-    {
-        return field_237_lcbSttbListNames;
-    }
-
-    /**
-     * Set the lcbSttbListNames field for the FIB record.
-     */
-    public void setLcbSttbListNames(int field_237_lcbSttbListNames)
-    {
-        this.field_237_lcbSttbListNames = field_237_lcbSttbListNames;
-    }
-
-    /**
-     * Get the fcSttbfUssr field for the FIB record.
-     */
-    public int getFcSttbfUssr()
-    {
-        return field_238_fcSttbfUssr;
-    }
-
-    /**
-     * Set the fcSttbfUssr field for the FIB record.
-     */
-    public void setFcSttbfUssr(int field_238_fcSttbfUssr)
-    {
-        this.field_238_fcSttbfUssr = field_238_fcSttbfUssr;
-    }
-
-    /**
-     * Get the lcbSttbfUssr field for the FIB record.
-     */
-    public int getLcbSttbfUssr()
-    {
-        return field_239_lcbSttbfUssr;
-    }
-
-    /**
-     * Set the lcbSttbfUssr field for the FIB record.
-     */
-    public void setLcbSttbfUssr(int field_239_lcbSttbfUssr)
-    {
-        this.field_239_lcbSttbfUssr = field_239_lcbSttbfUssr;
-    }
-
-    /**
-     * Sets the fDot field value.
-     *
-     */
-    public void setFDot(boolean value)
-    {
-        field_6_options = (short)fDot.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fDot field value.
-     */
-    public boolean isFDot()
-    {
-        return fDot.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fGlsy field value.
-     *
-     */
-    public void setFGlsy(boolean value)
-    {
-        field_6_options = (short)fGlsy.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fGlsy field value.
-     */
-    public boolean isFGlsy()
-    {
-        return fGlsy.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fComplex field value.
-     *
-     */
-    public void setFComplex(boolean value)
-    {
-        field_6_options = (short)fComplex.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fComplex field value.
-     */
-    public boolean isFComplex()
-    {
-        return fComplex.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fHasPic field value.
-     *
-     */
-    public void setFHasPic(boolean value)
-    {
-        field_6_options = (short)fHasPic.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fHasPic field value.
-     */
-    public boolean isFHasPic()
-    {
-        return fHasPic.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the cQuickSaves field value.
-     *
-     */
-    public void setCQuickSaves(byte value)
-    {
-        field_6_options = (short)cQuickSaves.setValue(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the cQuickSaves field value.
-     */
-    public byte getCQuickSaves()
-    {
-        return ( byte )cQuickSaves.getValue(field_6_options);
-
-    }
-
-    /**
-     * Sets the fEncrypted field value.
-     *
-     */
-    public void setFEncrypted(boolean value)
-    {
-        field_6_options = (short)fEncrypted.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fEncrypted field value.
-     */
-    public boolean isFEncrypted()
-    {
-        return fEncrypted.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fWhichTblStm field value.
-     *
-     */
-    public void setFWhichTblStm(boolean value)
-    {
-        field_6_options = (short)fWhichTblStm.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fWhichTblStm field value.
-     */
-    public boolean isFWhichTblStm()
-    {
-        return fWhichTblStm.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fReadOnlyRecommended field value.
-     *
-     */
-    public void setFReadOnlyRecommended(boolean value)
-    {
-        field_6_options = (short)fReadOnlyRecommended.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fReadOnlyRecommended field value.
-     */
-    public boolean isFReadOnlyRecommended()
-    {
-        return fReadOnlyRecommended.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fWriteReservation field value.
-     *
-     */
-    public void setFWriteReservation(boolean value)
-    {
-        field_6_options = (short)fWriteReservation.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fWriteReservation field value.
-     */
-    public boolean isFWriteReservation()
-    {
-        return fWriteReservation.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fExtChar field value.
-     *
-     */
-    public void setFExtChar(boolean value)
-    {
-        field_6_options = (short)fExtChar.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fExtChar field value.
-     */
-    public boolean isFExtChar()
-    {
-        return fExtChar.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fLoadOverride field value.
-     *
-     */
-    public void setFLoadOverride(boolean value)
-    {
-        field_6_options = (short)fLoadOverride.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fLoadOverride field value.
-     */
-    public boolean isFLoadOverride()
-    {
-        return fLoadOverride.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fFarEast field value.
-     *
-     */
-    public void setFFarEast(boolean value)
-    {
-        field_6_options = (short)fFarEast.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fFarEast field value.
-     */
-    public boolean isFFarEast()
-    {
-        return fFarEast.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fCrypto field value.
-     *
-     */
-    public void setFCrypto(boolean value)
-    {
-        field_6_options = (short)fCrypto.setBoolean(field_6_options, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fCrypto field value.
-     */
-    public boolean isFCrypto()
-    {
-        return fCrypto.isSet(field_6_options);
-
-    }
-
-    /**
-     * Sets the fMac field value.
-     *
-     */
-    public void setFMac(boolean value)
-    {
-        field_10_history = (short)fMac.setBoolean(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fMac field value.
-     */
-    public boolean isFMac()
-    {
-        return fMac.isSet(field_10_history);
-
-    }
-
-    /**
-     * Sets the fEmptySpecial field value.
-     *
-     */
-    public void setFEmptySpecial(boolean value)
-    {
-        field_10_history = (short)fEmptySpecial.setBoolean(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fEmptySpecial field value.
-     */
-    public boolean isFEmptySpecial()
-    {
-        return fEmptySpecial.isSet(field_10_history);
-
-    }
-
-    /**
-     * Sets the fLoadOverridePage field value.
-     *
-     */
-    public void setFLoadOverridePage(boolean value)
-    {
-        field_10_history = (short)fLoadOverridePage.setBoolean(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fLoadOverridePage field value.
-     */
-    public boolean isFLoadOverridePage()
-    {
-        return fLoadOverridePage.isSet(field_10_history);
-
-    }
-
-    /**
-     * Sets the fFutureSavedUndo field value.
-     *
-     */
-    public void setFFutureSavedUndo(boolean value)
-    {
-        field_10_history = (short)fFutureSavedUndo.setBoolean(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fFutureSavedUndo field value.
-     */
-    public boolean isFFutureSavedUndo()
-    {
-        return fFutureSavedUndo.isSet(field_10_history);
-
-    }
-
-    /**
-     * Sets the fWord97Saved field value.
-     *
-     */
-    public void setFWord97Saved(boolean value)
-    {
-        field_10_history = (short)fWord97Saved.setBoolean(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fWord97Saved field value.
-     */
-    public boolean isFWord97Saved()
-    {
-        return fWord97Saved.isSet(field_10_history);
-
-    }
-
-    /**
-     * Sets the fSpare0 field value.
-     *
-     */
-    public void setFSpare0(byte value)
-    {
-        field_10_history = (short)fSpare0.setValue(field_10_history, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fSpare0 field value.
-     */
-    public byte getFSpare0()
-    {
-        return ( byte )fSpare0.getValue(field_10_history);
-
-    }
-
-
-}  // END OF CLASS
-
-
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
deleted file mode 100644
index 6fbade2c6b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
+++ /dev/null
@@ -1,1264 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Paragraph Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class PAPAbstractType
-    implements HDFType
-{
-
-    private  int field_1_istd;
-    private  byte field_2_jc;
-    private  byte field_3_fKeep;
-    private  byte field_4_fKeepFollow;
-    private  byte field_5_fPageBreakBefore;
-    private  byte field_6_fBrLnAbove;
-    private  byte field_7_fBrLnBelow;
-    private  byte field_8_pcVert;
-    private  byte field_9_pcHorz;
-    private  byte field_10_brcp;
-    private  byte field_11_brcl;
-    private  byte field_12_ilvl;
-    private  byte field_13_fNoLnn;
-    private  int field_14_ilfo;
-    private  byte field_15_fSideBySide;
-    private  byte field_16_fNoAutoHyph;
-    private  byte field_17_fWidowControl;
-    private  int field_18_dxaRight;
-    private  int field_19_dxaLeft;
-    private  int field_20_dxaLeft1;
-    private  short[] field_21_lspd;
-    private  int field_22_dyaBefore;
-    private  int field_23_dyaAfter;
-    private  byte[] field_24_phe;
-    private  byte field_25_fCrLf;
-    private  byte field_26_fUsePgsuSettings;
-    private  byte field_27_fAdjustRight;
-    private  byte field_28_fKinsoku;
-    private  byte field_29_fWordWrap;
-    private  byte field_30_fOverflowPunct;
-    private  byte field_31_fTopLinePunct;
-    private  byte field_32_fAutoSpaceDE;
-    private  byte field_33_fAutoSpaceDN;
-    private  int field_34_wAlignFont;
-    private  short field_35_fontAlign;
-        private static BitField  fVertical = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fBackward = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0004);
-    private  byte field_36_fBackward;
-    private  byte field_37_fRotateFont;
-    private  byte field_38_fInTable;
-    private  byte field_39_fTtp;
-    private  byte field_40_wr;
-    private  byte field_41_fLocked;
-    private  byte[] field_42_ptap;
-    private  int field_43_dxaAbs;
-    private  int field_44_dyaAbs;
-    private  int field_45_dxaWidth;
-    private  short[] field_46_brcTop;
-    private  short[] field_47_brcLeft;
-    private  short[] field_48_brcBottom;
-    private  short[] field_49_brcRight;
-    private  short[] field_50_brcBetween;
-    private  short[] field_51_brcBar;
-    private  int field_52_dxaFromText;
-    private  int field_53_dyaFromText;
-    private  int field_54_dyaHeight;
-    private  byte field_55_fMinHeight;
-    private  short field_56_shd;
-    private  short field_57_dcs;
-    private  byte field_58_lvl;
-    private  byte field_59_fNumRMIns;
-    private  byte[] field_60_anld;
-    private  int field_61_fPropRMark;
-    private  int field_62_ibstPropRMark;
-    private  byte[] field_63_dttmPropRMark;
-    private  byte[] field_64_numrm;
-    private  int field_65_itbdMac;
-    private  byte[] field_66_rgdxaTab;
-    private  byte[] field_67_rgtbd;
-
-
-    public PAPAbstractType()
-    {
-
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 1 + 1 + 4 + 4 + 4 + 4 + 4 + 4 + 12 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 2 + 1 + 2 + 2 + 1 + 1 + 84 + 1 + 2 + 4 + 128 + 2 + 128 + 128;
-    }
-
-
-
-    /**
-     * Get the istd field for the PAP record.
-     */
-    public int getIstd()
-    {
-        return field_1_istd;
-    }
-
-    /**
-     * Set the istd field for the PAP record.
-     */
-    public void setIstd(int field_1_istd)
-    {
-        this.field_1_istd = field_1_istd;
-    }
-
-    /**
-     * Get the jc field for the PAP record.
-     */
-    public byte getJc()
-    {
-        return field_2_jc;
-    }
-
-    /**
-     * Set the jc field for the PAP record.
-     */
-    public void setJc(byte field_2_jc)
-    {
-        this.field_2_jc = field_2_jc;
-    }
-
-    /**
-     * Get the fKeep field for the PAP record.
-     */
-    public byte getFKeep()
-    {
-        return field_3_fKeep;
-    }
-
-    /**
-     * Set the fKeep field for the PAP record.
-     */
-    public void setFKeep(byte field_3_fKeep)
-    {
-        this.field_3_fKeep = field_3_fKeep;
-    }
-
-    /**
-     * Get the fKeepFollow field for the PAP record.
-     */
-    public byte getFKeepFollow()
-    {
-        return field_4_fKeepFollow;
-    }
-
-    /**
-     * Set the fKeepFollow field for the PAP record.
-     */
-    public void setFKeepFollow(byte field_4_fKeepFollow)
-    {
-        this.field_4_fKeepFollow = field_4_fKeepFollow;
-    }
-
-    /**
-     * Get the fPageBreakBefore field for the PAP record.
-     */
-    public byte getFPageBreakBefore()
-    {
-        return field_5_fPageBreakBefore;
-    }
-
-    /**
-     * Set the fPageBreakBefore field for the PAP record.
-     */
-    public void setFPageBreakBefore(byte field_5_fPageBreakBefore)
-    {
-        this.field_5_fPageBreakBefore = field_5_fPageBreakBefore;
-    }
-
-    /**
-     * Get the fBrLnAbove field for the PAP record.
-     */
-    public byte getFBrLnAbove()
-    {
-        return field_6_fBrLnAbove;
-    }
-
-    /**
-     * Set the fBrLnAbove field for the PAP record.
-     */
-    public void setFBrLnAbove(byte field_6_fBrLnAbove)
-    {
-        this.field_6_fBrLnAbove = field_6_fBrLnAbove;
-    }
-
-    /**
-     * Get the fBrLnBelow field for the PAP record.
-     */
-    public byte getFBrLnBelow()
-    {
-        return field_7_fBrLnBelow;
-    }
-
-    /**
-     * Set the fBrLnBelow field for the PAP record.
-     */
-    public void setFBrLnBelow(byte field_7_fBrLnBelow)
-    {
-        this.field_7_fBrLnBelow = field_7_fBrLnBelow;
-    }
-
-    /**
-     * Get the pcVert field for the PAP record.
-     */
-    public byte getPcVert()
-    {
-        return field_8_pcVert;
-    }
-
-    /**
-     * Set the pcVert field for the PAP record.
-     */
-    public void setPcVert(byte field_8_pcVert)
-    {
-        this.field_8_pcVert = field_8_pcVert;
-    }
-
-    /**
-     * Get the pcHorz field for the PAP record.
-     */
-    public byte getPcHorz()
-    {
-        return field_9_pcHorz;
-    }
-
-    /**
-     * Set the pcHorz field for the PAP record.
-     */
-    public void setPcHorz(byte field_9_pcHorz)
-    {
-        this.field_9_pcHorz = field_9_pcHorz;
-    }
-
-    /**
-     * Get the brcp field for the PAP record.
-     */
-    public byte getBrcp()
-    {
-        return field_10_brcp;
-    }
-
-    /**
-     * Set the brcp field for the PAP record.
-     */
-    public void setBrcp(byte field_10_brcp)
-    {
-        this.field_10_brcp = field_10_brcp;
-    }
-
-    /**
-     * Get the brcl field for the PAP record.
-     */
-    public byte getBrcl()
-    {
-        return field_11_brcl;
-    }
-
-    /**
-     * Set the brcl field for the PAP record.
-     */
-    public void setBrcl(byte field_11_brcl)
-    {
-        this.field_11_brcl = field_11_brcl;
-    }
-
-    /**
-     * Get the ilvl field for the PAP record.
-     */
-    public byte getIlvl()
-    {
-        return field_12_ilvl;
-    }
-
-    /**
-     * Set the ilvl field for the PAP record.
-     */
-    public void setIlvl(byte field_12_ilvl)
-    {
-        this.field_12_ilvl = field_12_ilvl;
-    }
-
-    /**
-     * Get the fNoLnn field for the PAP record.
-     */
-    public byte getFNoLnn()
-    {
-        return field_13_fNoLnn;
-    }
-
-    /**
-     * Set the fNoLnn field for the PAP record.
-     */
-    public void setFNoLnn(byte field_13_fNoLnn)
-    {
-        this.field_13_fNoLnn = field_13_fNoLnn;
-    }
-
-    /**
-     * Get the ilfo field for the PAP record.
-     */
-    public int getIlfo()
-    {
-        return field_14_ilfo;
-    }
-
-    /**
-     * Set the ilfo field for the PAP record.
-     */
-    public void setIlfo(int field_14_ilfo)
-    {
-        this.field_14_ilfo = field_14_ilfo;
-    }
-
-    /**
-     * Get the fSideBySide field for the PAP record.
-     */
-    public byte getFSideBySide()
-    {
-        return field_15_fSideBySide;
-    }
-
-    /**
-     * Set the fSideBySide field for the PAP record.
-     */
-    public void setFSideBySide(byte field_15_fSideBySide)
-    {
-        this.field_15_fSideBySide = field_15_fSideBySide;
-    }
-
-    /**
-     * Get the fNoAutoHyph field for the PAP record.
-     */
-    public byte getFNoAutoHyph()
-    {
-        return field_16_fNoAutoHyph;
-    }
-
-    /**
-     * Set the fNoAutoHyph field for the PAP record.
-     */
-    public void setFNoAutoHyph(byte field_16_fNoAutoHyph)
-    {
-        this.field_16_fNoAutoHyph = field_16_fNoAutoHyph;
-    }
-
-    /**
-     * Get the fWidowControl field for the PAP record.
-     */
-    public byte getFWidowControl()
-    {
-        return field_17_fWidowControl;
-    }
-
-    /**
-     * Set the fWidowControl field for the PAP record.
-     */
-    public void setFWidowControl(byte field_17_fWidowControl)
-    {
-        this.field_17_fWidowControl = field_17_fWidowControl;
-    }
-
-    /**
-     * Get the dxaRight field for the PAP record.
-     */
-    public int getDxaRight()
-    {
-        return field_18_dxaRight;
-    }
-
-    /**
-     * Set the dxaRight field for the PAP record.
-     */
-    public void setDxaRight(int field_18_dxaRight)
-    {
-        this.field_18_dxaRight = field_18_dxaRight;
-    }
-
-    /**
-     * Get the dxaLeft field for the PAP record.
-     */
-    public int getDxaLeft()
-    {
-        return field_19_dxaLeft;
-    }
-
-    /**
-     * Set the dxaLeft field for the PAP record.
-     */
-    public void setDxaLeft(int field_19_dxaLeft)
-    {
-        this.field_19_dxaLeft = field_19_dxaLeft;
-    }
-
-    /**
-     * Get the dxaLeft1 field for the PAP record.
-     */
-    public int getDxaLeft1()
-    {
-        return field_20_dxaLeft1;
-    }
-
-    /**
-     * Set the dxaLeft1 field for the PAP record.
-     */
-    public void setDxaLeft1(int field_20_dxaLeft1)
-    {
-        this.field_20_dxaLeft1 = field_20_dxaLeft1;
-    }
-
-    /**
-     * Get the lspd field for the PAP record.
-     */
-    public short[] getLspd()
-    {
-        return field_21_lspd;
-    }
-
-    /**
-     * Set the lspd field for the PAP record.
-     */
-    public void setLspd(short[] field_21_lspd)
-    {
-        this.field_21_lspd = field_21_lspd;
-    }
-
-    /**
-     * Get the dyaBefore field for the PAP record.
-     */
-    public int getDyaBefore()
-    {
-        return field_22_dyaBefore;
-    }
-
-    /**
-     * Set the dyaBefore field for the PAP record.
-     */
-    public void setDyaBefore(int field_22_dyaBefore)
-    {
-        this.field_22_dyaBefore = field_22_dyaBefore;
-    }
-
-    /**
-     * Get the dyaAfter field for the PAP record.
-     */
-    public int getDyaAfter()
-    {
-        return field_23_dyaAfter;
-    }
-
-    /**
-     * Set the dyaAfter field for the PAP record.
-     */
-    public void setDyaAfter(int field_23_dyaAfter)
-    {
-        this.field_23_dyaAfter = field_23_dyaAfter;
-    }
-
-    /**
-     * Get the phe field for the PAP record.
-     */
-    public byte[] getPhe()
-    {
-        return field_24_phe;
-    }
-
-    /**
-     * Set the phe field for the PAP record.
-     */
-    public void setPhe(byte[] field_24_phe)
-    {
-        this.field_24_phe = field_24_phe;
-    }
-
-    /**
-     * Get the fCrLf field for the PAP record.
-     */
-    public byte getFCrLf()
-    {
-        return field_25_fCrLf;
-    }
-
-    /**
-     * Set the fCrLf field for the PAP record.
-     */
-    public void setFCrLf(byte field_25_fCrLf)
-    {
-        this.field_25_fCrLf = field_25_fCrLf;
-    }
-
-    /**
-     * Get the fUsePgsuSettings field for the PAP record.
-     */
-    public byte getFUsePgsuSettings()
-    {
-        return field_26_fUsePgsuSettings;
-    }
-
-    /**
-     * Set the fUsePgsuSettings field for the PAP record.
-     */
-    public void setFUsePgsuSettings(byte field_26_fUsePgsuSettings)
-    {
-        this.field_26_fUsePgsuSettings = field_26_fUsePgsuSettings;
-    }
-
-    /**
-     * Get the fAdjustRight field for the PAP record.
-     */
-    public byte getFAdjustRight()
-    {
-        return field_27_fAdjustRight;
-    }
-
-    /**
-     * Set the fAdjustRight field for the PAP record.
-     */
-    public void setFAdjustRight(byte field_27_fAdjustRight)
-    {
-        this.field_27_fAdjustRight = field_27_fAdjustRight;
-    }
-
-    /**
-     * Get the fKinsoku field for the PAP record.
-     */
-    public byte getFKinsoku()
-    {
-        return field_28_fKinsoku;
-    }
-
-    /**
-     * Set the fKinsoku field for the PAP record.
-     */
-    public void setFKinsoku(byte field_28_fKinsoku)
-    {
-        this.field_28_fKinsoku = field_28_fKinsoku;
-    }
-
-    /**
-     * Get the fWordWrap field for the PAP record.
-     */
-    public byte getFWordWrap()
-    {
-        return field_29_fWordWrap;
-    }
-
-    /**
-     * Set the fWordWrap field for the PAP record.
-     */
-    public void setFWordWrap(byte field_29_fWordWrap)
-    {
-        this.field_29_fWordWrap = field_29_fWordWrap;
-    }
-
-    /**
-     * Get the fOverflowPunct field for the PAP record.
-     */
-    public byte getFOverflowPunct()
-    {
-        return field_30_fOverflowPunct;
-    }
-
-    /**
-     * Set the fOverflowPunct field for the PAP record.
-     */
-    public void setFOverflowPunct(byte field_30_fOverflowPunct)
-    {
-        this.field_30_fOverflowPunct = field_30_fOverflowPunct;
-    }
-
-    /**
-     * Get the fTopLinePunct field for the PAP record.
-     */
-    public byte getFTopLinePunct()
-    {
-        return field_31_fTopLinePunct;
-    }
-
-    /**
-     * Set the fTopLinePunct field for the PAP record.
-     */
-    public void setFTopLinePunct(byte field_31_fTopLinePunct)
-    {
-        this.field_31_fTopLinePunct = field_31_fTopLinePunct;
-    }
-
-    /**
-     * Get the fAutoSpaceDE field for the PAP record.
-     */
-    public byte getFAutoSpaceDE()
-    {
-        return field_32_fAutoSpaceDE;
-    }
-
-    /**
-     * Set the fAutoSpaceDE field for the PAP record.
-     */
-    public void setFAutoSpaceDE(byte field_32_fAutoSpaceDE)
-    {
-        this.field_32_fAutoSpaceDE = field_32_fAutoSpaceDE;
-    }
-
-    /**
-     * Get the fAutoSpaceDN field for the PAP record.
-     */
-    public byte getFAutoSpaceDN()
-    {
-        return field_33_fAutoSpaceDN;
-    }
-
-    /**
-     * Set the fAutoSpaceDN field for the PAP record.
-     */
-    public void setFAutoSpaceDN(byte field_33_fAutoSpaceDN)
-    {
-        this.field_33_fAutoSpaceDN = field_33_fAutoSpaceDN;
-    }
-
-    /**
-     * Get the wAlignFont field for the PAP record.
-     */
-    public int getWAlignFont()
-    {
-        return field_34_wAlignFont;
-    }
-
-    /**
-     * Set the wAlignFont field for the PAP record.
-     */
-    public void setWAlignFont(int field_34_wAlignFont)
-    {
-        this.field_34_wAlignFont = field_34_wAlignFont;
-    }
-
-    /**
-     * Get the fontAlign field for the PAP record.
-     */
-    public short getFontAlign()
-    {
-        return field_35_fontAlign;
-    }
-
-    /**
-     * Set the fontAlign field for the PAP record.
-     */
-    public void setFontAlign(short field_35_fontAlign)
-    {
-        this.field_35_fontAlign = field_35_fontAlign;
-    }
-
-    /**
-     * Get the fBackward field for the PAP record.
-     */
-    public byte getFBackward()
-    {
-        return field_36_fBackward;
-    }
-
-    /**
-     * Set the fBackward field for the PAP record.
-     */
-    public void setFBackward(byte field_36_fBackward)
-    {
-        this.field_36_fBackward = field_36_fBackward;
-    }
-
-    /**
-     * Get the fRotateFont field for the PAP record.
-     */
-    public byte getFRotateFont()
-    {
-        return field_37_fRotateFont;
-    }
-
-    /**
-     * Set the fRotateFont field for the PAP record.
-     */
-    public void setFRotateFont(byte field_37_fRotateFont)
-    {
-        this.field_37_fRotateFont = field_37_fRotateFont;
-    }
-
-    /**
-     * Get the fInTable field for the PAP record.
-     */
-    public byte getFInTable()
-    {
-        return field_38_fInTable;
-    }
-
-    /**
-     * Set the fInTable field for the PAP record.
-     */
-    public void setFInTable(byte field_38_fInTable)
-    {
-        this.field_38_fInTable = field_38_fInTable;
-    }
-
-    /**
-     * Get the fTtp field for the PAP record.
-     */
-    public byte getFTtp()
-    {
-        return field_39_fTtp;
-    }
-
-    /**
-     * Set the fTtp field for the PAP record.
-     */
-    public void setFTtp(byte field_39_fTtp)
-    {
-        this.field_39_fTtp = field_39_fTtp;
-    }
-
-    /**
-     * Get the wr field for the PAP record.
-     */
-    public byte getWr()
-    {
-        return field_40_wr;
-    }
-
-    /**
-     * Set the wr field for the PAP record.
-     */
-    public void setWr(byte field_40_wr)
-    {
-        this.field_40_wr = field_40_wr;
-    }
-
-    /**
-     * Get the fLocked field for the PAP record.
-     */
-    public byte getFLocked()
-    {
-        return field_41_fLocked;
-    }
-
-    /**
-     * Set the fLocked field for the PAP record.
-     */
-    public void setFLocked(byte field_41_fLocked)
-    {
-        this.field_41_fLocked = field_41_fLocked;
-    }
-
-    /**
-     * Get the ptap field for the PAP record.
-     */
-    public byte[] getPtap()
-    {
-        return field_42_ptap;
-    }
-
-    /**
-     * Set the ptap field for the PAP record.
-     */
-    public void setPtap(byte[] field_42_ptap)
-    {
-        this.field_42_ptap = field_42_ptap;
-    }
-
-    /**
-     * Get the dxaAbs field for the PAP record.
-     */
-    public int getDxaAbs()
-    {
-        return field_43_dxaAbs;
-    }
-
-    /**
-     * Set the dxaAbs field for the PAP record.
-     */
-    public void setDxaAbs(int field_43_dxaAbs)
-    {
-        this.field_43_dxaAbs = field_43_dxaAbs;
-    }
-
-    /**
-     * Get the dyaAbs field for the PAP record.
-     */
-    public int getDyaAbs()
-    {
-        return field_44_dyaAbs;
-    }
-
-    /**
-     * Set the dyaAbs field for the PAP record.
-     */
-    public void setDyaAbs(int field_44_dyaAbs)
-    {
-        this.field_44_dyaAbs = field_44_dyaAbs;
-    }
-
-    /**
-     * Get the dxaWidth field for the PAP record.
-     */
-    public int getDxaWidth()
-    {
-        return field_45_dxaWidth;
-    }
-
-    /**
-     * Set the dxaWidth field for the PAP record.
-     */
-    public void setDxaWidth(int field_45_dxaWidth)
-    {
-        this.field_45_dxaWidth = field_45_dxaWidth;
-    }
-
-    /**
-     * Get the brcTop field for the PAP record.
-     */
-    public short[] getBrcTop()
-    {
-        return field_46_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the PAP record.
-     */
-    public void setBrcTop(short[] field_46_brcTop)
-    {
-        this.field_46_brcTop = field_46_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the PAP record.
-     */
-    public short[] getBrcLeft()
-    {
-        return field_47_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the PAP record.
-     */
-    public void setBrcLeft(short[] field_47_brcLeft)
-    {
-        this.field_47_brcLeft = field_47_brcLeft;
-    }
-
-    /**
-     * Get the brcBottom field for the PAP record.
-     */
-    public short[] getBrcBottom()
-    {
-        return field_48_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the PAP record.
-     */
-    public void setBrcBottom(short[] field_48_brcBottom)
-    {
-        this.field_48_brcBottom = field_48_brcBottom;
-    }
-
-    /**
-     * Get the brcRight field for the PAP record.
-     */
-    public short[] getBrcRight()
-    {
-        return field_49_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the PAP record.
-     */
-    public void setBrcRight(short[] field_49_brcRight)
-    {
-        this.field_49_brcRight = field_49_brcRight;
-    }
-
-    /**
-     * Get the brcBetween field for the PAP record.
-     */
-    public short[] getBrcBetween()
-    {
-        return field_50_brcBetween;
-    }
-
-    /**
-     * Set the brcBetween field for the PAP record.
-     */
-    public void setBrcBetween(short[] field_50_brcBetween)
-    {
-        this.field_50_brcBetween = field_50_brcBetween;
-    }
-
-    /**
-     * Get the brcBar field for the PAP record.
-     */
-    public short[] getBrcBar()
-    {
-        return field_51_brcBar;
-    }
-
-    /**
-     * Set the brcBar field for the PAP record.
-     */
-    public void setBrcBar(short[] field_51_brcBar)
-    {
-        this.field_51_brcBar = field_51_brcBar;
-    }
-
-    /**
-     * Get the dxaFromText field for the PAP record.
-     */
-    public int getDxaFromText()
-    {
-        return field_52_dxaFromText;
-    }
-
-    /**
-     * Set the dxaFromText field for the PAP record.
-     */
-    public void setDxaFromText(int field_52_dxaFromText)
-    {
-        this.field_52_dxaFromText = field_52_dxaFromText;
-    }
-
-    /**
-     * Get the dyaFromText field for the PAP record.
-     */
-    public int getDyaFromText()
-    {
-        return field_53_dyaFromText;
-    }
-
-    /**
-     * Set the dyaFromText field for the PAP record.
-     */
-    public void setDyaFromText(int field_53_dyaFromText)
-    {
-        this.field_53_dyaFromText = field_53_dyaFromText;
-    }
-
-    /**
-     * Get the dyaHeight field for the PAP record.
-     */
-    public int getDyaHeight()
-    {
-        return field_54_dyaHeight;
-    }
-
-    /**
-     * Set the dyaHeight field for the PAP record.
-     */
-    public void setDyaHeight(int field_54_dyaHeight)
-    {
-        this.field_54_dyaHeight = field_54_dyaHeight;
-    }
-
-    /**
-     * Get the fMinHeight field for the PAP record.
-     */
-    public byte getFMinHeight()
-    {
-        return field_55_fMinHeight;
-    }
-
-    /**
-     * Set the fMinHeight field for the PAP record.
-     */
-    public void setFMinHeight(byte field_55_fMinHeight)
-    {
-        this.field_55_fMinHeight = field_55_fMinHeight;
-    }
-
-    /**
-     * Get the shd field for the PAP record.
-     */
-    public short getShd()
-    {
-        return field_56_shd;
-    }
-
-    /**
-     * Set the shd field for the PAP record.
-     */
-    public void setShd(short field_56_shd)
-    {
-        this.field_56_shd = field_56_shd;
-    }
-
-    /**
-     * Get the dcs field for the PAP record.
-     */
-    public short getDcs()
-    {
-        return field_57_dcs;
-    }
-
-    /**
-     * Set the dcs field for the PAP record.
-     */
-    public void setDcs(short field_57_dcs)
-    {
-        this.field_57_dcs = field_57_dcs;
-    }
-
-    /**
-     * Get the lvl field for the PAP record.
-     */
-    public byte getLvl()
-    {
-        return field_58_lvl;
-    }
-
-    /**
-     * Set the lvl field for the PAP record.
-     */
-    public void setLvl(byte field_58_lvl)
-    {
-        this.field_58_lvl = field_58_lvl;
-    }
-
-    /**
-     * Get the fNumRMIns field for the PAP record.
-     */
-    public byte getFNumRMIns()
-    {
-        return field_59_fNumRMIns;
-    }
-
-    /**
-     * Set the fNumRMIns field for the PAP record.
-     */
-    public void setFNumRMIns(byte field_59_fNumRMIns)
-    {
-        this.field_59_fNumRMIns = field_59_fNumRMIns;
-    }
-
-    /**
-     * Get the anld field for the PAP record.
-     */
-    public byte[] getAnld()
-    {
-        return field_60_anld;
-    }
-
-    /**
-     * Set the anld field for the PAP record.
-     */
-    public void setAnld(byte[] field_60_anld)
-    {
-        this.field_60_anld = field_60_anld;
-    }
-
-    /**
-     * Get the fPropRMark field for the PAP record.
-     */
-    public int getFPropRMark()
-    {
-        return field_61_fPropRMark;
-    }
-
-    /**
-     * Set the fPropRMark field for the PAP record.
-     */
-    public void setFPropRMark(int field_61_fPropRMark)
-    {
-        this.field_61_fPropRMark = field_61_fPropRMark;
-    }
-
-    /**
-     * Get the ibstPropRMark field for the PAP record.
-     */
-    public int getIbstPropRMark()
-    {
-        return field_62_ibstPropRMark;
-    }
-
-    /**
-     * Set the ibstPropRMark field for the PAP record.
-     */
-    public void setIbstPropRMark(int field_62_ibstPropRMark)
-    {
-        this.field_62_ibstPropRMark = field_62_ibstPropRMark;
-    }
-
-    /**
-     * Get the dttmPropRMark field for the PAP record.
-     */
-    public byte[] getDttmPropRMark()
-    {
-        return field_63_dttmPropRMark;
-    }
-
-    /**
-     * Set the dttmPropRMark field for the PAP record.
-     */
-    public void setDttmPropRMark(byte[] field_63_dttmPropRMark)
-    {
-        this.field_63_dttmPropRMark = field_63_dttmPropRMark;
-    }
-
-    /**
-     * Get the numrm field for the PAP record.
-     */
-    public byte[] getNumrm()
-    {
-        return field_64_numrm;
-    }
-
-    /**
-     * Set the numrm field for the PAP record.
-     */
-    public void setNumrm(byte[] field_64_numrm)
-    {
-        this.field_64_numrm = field_64_numrm;
-    }
-
-    /**
-     * Get the itbdMac field for the PAP record.
-     */
-    public int getItbdMac()
-    {
-        return field_65_itbdMac;
-    }
-
-    /**
-     * Set the itbdMac field for the PAP record.
-     */
-    public void setItbdMac(int field_65_itbdMac)
-    {
-        this.field_65_itbdMac = field_65_itbdMac;
-    }
-
-    /**
-     * Get the rgdxaTab field for the PAP record.
-     */
-    public byte[] getRgdxaTab()
-    {
-        return field_66_rgdxaTab;
-    }
-
-    /**
-     * Set the rgdxaTab field for the PAP record.
-     */
-    public void setRgdxaTab(byte[] field_66_rgdxaTab)
-    {
-        this.field_66_rgdxaTab = field_66_rgdxaTab;
-    }
-
-    /**
-     * Get the rgtbd field for the PAP record.
-     */
-    public byte[] getRgtbd()
-    {
-        return field_67_rgtbd;
-    }
-
-    /**
-     * Set the rgtbd field for the PAP record.
-     */
-    public void setRgtbd(byte[] field_67_rgtbd)
-    {
-        this.field_67_rgtbd = field_67_rgtbd;
-    }
-
-    /**
-     * Sets the fVertical field value.
-     *
-     */
-    public void setFVertical(boolean value)
-    {
-        field_35_fontAlign = (short)fVertical.setBoolean(field_35_fontAlign, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fVertical field value.
-     */
-    public boolean isFVertical()
-    {
-        return fVertical.isSet(field_35_fontAlign);
-
-    }
-
-    /**
-     * Sets the fBackward field value.
-     *
-     */
-    public void setFBackward(boolean value)
-    {
-        field_35_fontAlign = (short)fBackward.setBoolean(field_35_fontAlign, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fBackward field value.
-     */
-    public boolean isFBackward()
-    {
-        return fBackward.isSet(field_35_fontAlign);
-
-    }
-
-    /**
-     * Sets the fRotateFont field value.
-     *
-     */
-    public void setFRotateFont(boolean value)
-    {
-        field_35_fontAlign = (short)fRotateFont.setBoolean(field_35_fontAlign, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fRotateFont field value.
-     */
-    public boolean isFRotateFont()
-    {
-        return fRotateFont.isSet(field_35_fontAlign);
-
-    }
-
-
-}  // END OF CLASS
-
-
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
deleted file mode 100644
index fda860f33b..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
+++ /dev/null
@@ -1,1060 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Section Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class SEPAbstractType
-    implements HDFType
-{
-
-    private  byte field_1_bkc;
-    private  boolean field_2_fTitlePage;
-    private  boolean field_3_fAutoPgn;
-    private  byte field_4_nfcPgn;
-    private  boolean field_5_fUnlocked;
-    private  byte field_6_cnsPgn;
-    private  boolean field_7_fPgnRestart;
-    private  boolean field_8_fEndNote;
-    private  byte field_9_lnc;
-    private  byte field_10_grpfIhdt;
-    private  int field_11_nLnnMod;
-    private  int field_12_dxaLnn;
-    private  int field_13_dxaPgn;
-    private  int field_14_dyaPgn;
-    private  boolean field_15_fLBetween;
-    private  byte field_16_vjc;
-    private  int field_17_dmBinFirst;
-    private  int field_18_dmBinOther;
-    private  int field_19_dmPaperReq;
-    private  short[] field_20_brcTop;
-    private  short[] field_21_brcLeft;
-    private  short[] field_22_brcBottom;
-    private  short[] field_23_brcRight;
-    private  boolean field_24_fPropMark;
-    private  int field_25_ibstPropRMark;
-    private  int field_26_dttmPropRMark;
-    private  int field_27_dxtCharSpace;
-    private  int field_28_dyaLinePitch;
-    private  int field_29_clm;
-    private  int field_30_unused2;
-    private  byte field_31_dmOrientPage;
-    private  byte field_32_iHeadingPgn;
-    private  int field_33_pgnStart;
-    private  int field_34_lnnMin;
-    private  int field_35_wTextFlow;
-    private  short field_36_unused3;
-    private  int field_37_pgbProp;
-    private  short field_38_unused4;
-    private  int field_39_xaPage;
-    private  int field_40_yaPage;
-    private  int field_41_xaPageNUp;
-    private  int field_42_yaPageNUp;
-    private  int field_43_dxaLeft;
-    private  int field_44_dxaRight;
-    private  int field_45_dyaTop;
-    private  int field_46_dyaBottom;
-    private  int field_47_dzaGutter;
-    private  int field_48_dyaHdrTop;
-    private  int field_49_dyaHdrBottom;
-    private  int field_50_ccolM1;
-    private  boolean field_51_fEvenlySpaced;
-    private  byte field_52_unused5;
-    private  int field_53_dxaColumns;
-    private  int[] field_54_rgdxaColumn;
-    private  int field_55_dxaColumnWidth;
-    private  byte field_56_dmOrientFirst;
-    private  byte field_57_fLayout;
-    private  short field_58_unused6;
-    private  byte[] field_59_olstAnm;
-
-
-    public SEPAbstractType()
-    {
-
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 1 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 1 + 1 + 2 + 4 + 2 + 2 + 0 + 1 + 2 + 2 + 2 + 4 + 4 + 4 + 4 + 0 + 2 + 4 + 4 + 4 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 2 + 0 + 1 + 4 + 356 + 4 + 1 + 1 + 2 + 212;
-    }
-
-
-
-    /**
-     * Get the bkc field for the SEP record.
-     */
-    public byte getBkc()
-    {
-        return field_1_bkc;
-    }
-
-    /**
-     * Set the bkc field for the SEP record.
-     */
-    public void setBkc(byte field_1_bkc)
-    {
-        this.field_1_bkc = field_1_bkc;
-    }
-
-    /**
-     * Get the fTitlePage field for the SEP record.
-     */
-    public boolean getFTitlePage()
-    {
-        return field_2_fTitlePage;
-    }
-
-    /**
-     * Set the fTitlePage field for the SEP record.
-     */
-    public void setFTitlePage(boolean field_2_fTitlePage)
-    {
-        this.field_2_fTitlePage = field_2_fTitlePage;
-    }
-
-    /**
-     * Get the fAutoPgn field for the SEP record.
-     */
-    public boolean getFAutoPgn()
-    {
-        return field_3_fAutoPgn;
-    }
-
-    /**
-     * Set the fAutoPgn field for the SEP record.
-     */
-    public void setFAutoPgn(boolean field_3_fAutoPgn)
-    {
-        this.field_3_fAutoPgn = field_3_fAutoPgn;
-    }
-
-    /**
-     * Get the nfcPgn field for the SEP record.
-     */
-    public byte getNfcPgn()
-    {
-        return field_4_nfcPgn;
-    }
-
-    /**
-     * Set the nfcPgn field for the SEP record.
-     */
-    public void setNfcPgn(byte field_4_nfcPgn)
-    {
-        this.field_4_nfcPgn = field_4_nfcPgn;
-    }
-
-    /**
-     * Get the fUnlocked field for the SEP record.
-     */
-    public boolean getFUnlocked()
-    {
-        return field_5_fUnlocked;
-    }
-
-    /**
-     * Set the fUnlocked field for the SEP record.
-     */
-    public void setFUnlocked(boolean field_5_fUnlocked)
-    {
-        this.field_5_fUnlocked = field_5_fUnlocked;
-    }
-
-    /**
-     * Get the cnsPgn field for the SEP record.
-     */
-    public byte getCnsPgn()
-    {
-        return field_6_cnsPgn;
-    }
-
-    /**
-     * Set the cnsPgn field for the SEP record.
-     */
-    public void setCnsPgn(byte field_6_cnsPgn)
-    {
-        this.field_6_cnsPgn = field_6_cnsPgn;
-    }
-
-    /**
-     * Get the fPgnRestart field for the SEP record.
-     */
-    public boolean getFPgnRestart()
-    {
-        return field_7_fPgnRestart;
-    }
-
-    /**
-     * Set the fPgnRestart field for the SEP record.
-     */
-    public void setFPgnRestart(boolean field_7_fPgnRestart)
-    {
-        this.field_7_fPgnRestart = field_7_fPgnRestart;
-    }
-
-    /**
-     * Get the fEndNote field for the SEP record.
-     */
-    public boolean getFEndNote()
-    {
-        return field_8_fEndNote;
-    }
-
-    /**
-     * Set the fEndNote field for the SEP record.
-     */
-    public void setFEndNote(boolean field_8_fEndNote)
-    {
-        this.field_8_fEndNote = field_8_fEndNote;
-    }
-
-    /**
-     * Get the lnc field for the SEP record.
-     */
-    public byte getLnc()
-    {
-        return field_9_lnc;
-    }
-
-    /**
-     * Set the lnc field for the SEP record.
-     */
-    public void setLnc(byte field_9_lnc)
-    {
-        this.field_9_lnc = field_9_lnc;
-    }
-
-    /**
-     * Get the grpfIhdt field for the SEP record.
-     */
-    public byte getGrpfIhdt()
-    {
-        return field_10_grpfIhdt;
-    }
-
-    /**
-     * Set the grpfIhdt field for the SEP record.
-     */
-    public void setGrpfIhdt(byte field_10_grpfIhdt)
-    {
-        this.field_10_grpfIhdt = field_10_grpfIhdt;
-    }
-
-    /**
-     * Get the nLnnMod field for the SEP record.
-     */
-    public int getNLnnMod()
-    {
-        return field_11_nLnnMod;
-    }
-
-    /**
-     * Set the nLnnMod field for the SEP record.
-     */
-    public void setNLnnMod(int field_11_nLnnMod)
-    {
-        this.field_11_nLnnMod = field_11_nLnnMod;
-    }
-
-    /**
-     * Get the dxaLnn field for the SEP record.
-     */
-    public int getDxaLnn()
-    {
-        return field_12_dxaLnn;
-    }
-
-    /**
-     * Set the dxaLnn field for the SEP record.
-     */
-    public void setDxaLnn(int field_12_dxaLnn)
-    {
-        this.field_12_dxaLnn = field_12_dxaLnn;
-    }
-
-    /**
-     * Get the dxaPgn field for the SEP record.
-     */
-    public int getDxaPgn()
-    {
-        return field_13_dxaPgn;
-    }
-
-    /**
-     * Set the dxaPgn field for the SEP record.
-     */
-    public void setDxaPgn(int field_13_dxaPgn)
-    {
-        this.field_13_dxaPgn = field_13_dxaPgn;
-    }
-
-    /**
-     * Get the dyaPgn field for the SEP record.
-     */
-    public int getDyaPgn()
-    {
-        return field_14_dyaPgn;
-    }
-
-    /**
-     * Set the dyaPgn field for the SEP record.
-     */
-    public void setDyaPgn(int field_14_dyaPgn)
-    {
-        this.field_14_dyaPgn = field_14_dyaPgn;
-    }
-
-    /**
-     * Get the fLBetween field for the SEP record.
-     */
-    public boolean getFLBetween()
-    {
-        return field_15_fLBetween;
-    }
-
-    /**
-     * Set the fLBetween field for the SEP record.
-     */
-    public void setFLBetween(boolean field_15_fLBetween)
-    {
-        this.field_15_fLBetween = field_15_fLBetween;
-    }
-
-    /**
-     * Get the vjc field for the SEP record.
-     */
-    public byte getVjc()
-    {
-        return field_16_vjc;
-    }
-
-    /**
-     * Set the vjc field for the SEP record.
-     */
-    public void setVjc(byte field_16_vjc)
-    {
-        this.field_16_vjc = field_16_vjc;
-    }
-
-    /**
-     * Get the dmBinFirst field for the SEP record.
-     */
-    public int getDmBinFirst()
-    {
-        return field_17_dmBinFirst;
-    }
-
-    /**
-     * Set the dmBinFirst field for the SEP record.
-     */
-    public void setDmBinFirst(int field_17_dmBinFirst)
-    {
-        this.field_17_dmBinFirst = field_17_dmBinFirst;
-    }
-
-    /**
-     * Get the dmBinOther field for the SEP record.
-     */
-    public int getDmBinOther()
-    {
-        return field_18_dmBinOther;
-    }
-
-    /**
-     * Set the dmBinOther field for the SEP record.
-     */
-    public void setDmBinOther(int field_18_dmBinOther)
-    {
-        this.field_18_dmBinOther = field_18_dmBinOther;
-    }
-
-    /**
-     * Get the dmPaperReq field for the SEP record.
-     */
-    public int getDmPaperReq()
-    {
-        return field_19_dmPaperReq;
-    }
-
-    /**
-     * Set the dmPaperReq field for the SEP record.
-     */
-    public void setDmPaperReq(int field_19_dmPaperReq)
-    {
-        this.field_19_dmPaperReq = field_19_dmPaperReq;
-    }
-
-    /**
-     * Get the brcTop field for the SEP record.
-     */
-    public short[] getBrcTop()
-    {
-        return field_20_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the SEP record.
-     */
-    public void setBrcTop(short[] field_20_brcTop)
-    {
-        this.field_20_brcTop = field_20_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the SEP record.
-     */
-    public short[] getBrcLeft()
-    {
-        return field_21_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the SEP record.
-     */
-    public void setBrcLeft(short[] field_21_brcLeft)
-    {
-        this.field_21_brcLeft = field_21_brcLeft;
-    }
-
-    /**
-     * Get the brcBottom field for the SEP record.
-     */
-    public short[] getBrcBottom()
-    {
-        return field_22_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the SEP record.
-     */
-    public void setBrcBottom(short[] field_22_brcBottom)
-    {
-        this.field_22_brcBottom = field_22_brcBottom;
-    }
-
-    /**
-     * Get the brcRight field for the SEP record.
-     */
-    public short[] getBrcRight()
-    {
-        return field_23_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the SEP record.
-     */
-    public void setBrcRight(short[] field_23_brcRight)
-    {
-        this.field_23_brcRight = field_23_brcRight;
-    }
-
-    /**
-     * Get the fPropMark field for the SEP record.
-     */
-    public boolean getFPropMark()
-    {
-        return field_24_fPropMark;
-    }
-
-    /**
-     * Set the fPropMark field for the SEP record.
-     */
-    public void setFPropMark(boolean field_24_fPropMark)
-    {
-        this.field_24_fPropMark = field_24_fPropMark;
-    }
-
-    /**
-     * Get the ibstPropRMark field for the SEP record.
-     */
-    public int getIbstPropRMark()
-    {
-        return field_25_ibstPropRMark;
-    }
-
-    /**
-     * Set the ibstPropRMark field for the SEP record.
-     */
-    public void setIbstPropRMark(int field_25_ibstPropRMark)
-    {
-        this.field_25_ibstPropRMark = field_25_ibstPropRMark;
-    }
-
-    /**
-     * Get the dttmPropRMark field for the SEP record.
-     */
-    public int getDttmPropRMark()
-    {
-        return field_26_dttmPropRMark;
-    }
-
-    /**
-     * Set the dttmPropRMark field for the SEP record.
-     */
-    public void setDttmPropRMark(int field_26_dttmPropRMark)
-    {
-        this.field_26_dttmPropRMark = field_26_dttmPropRMark;
-    }
-
-    /**
-     * Get the dxtCharSpace field for the SEP record.
-     */
-    public int getDxtCharSpace()
-    {
-        return field_27_dxtCharSpace;
-    }
-
-    /**
-     * Set the dxtCharSpace field for the SEP record.
-     */
-    public void setDxtCharSpace(int field_27_dxtCharSpace)
-    {
-        this.field_27_dxtCharSpace = field_27_dxtCharSpace;
-    }
-
-    /**
-     * Get the dyaLinePitch field for the SEP record.
-     */
-    public int getDyaLinePitch()
-    {
-        return field_28_dyaLinePitch;
-    }
-
-    /**
-     * Set the dyaLinePitch field for the SEP record.
-     */
-    public void setDyaLinePitch(int field_28_dyaLinePitch)
-    {
-        this.field_28_dyaLinePitch = field_28_dyaLinePitch;
-    }
-
-    /**
-     * Get the clm field for the SEP record.
-     */
-    public int getClm()
-    {
-        return field_29_clm;
-    }
-
-    /**
-     * Set the clm field for the SEP record.
-     */
-    public void setClm(int field_29_clm)
-    {
-        this.field_29_clm = field_29_clm;
-    }
-
-    /**
-     * Get the unused2 field for the SEP record.
-     */
-    public int getUnused2()
-    {
-        return field_30_unused2;
-    }
-
-    /**
-     * Set the unused2 field for the SEP record.
-     */
-    public void setUnused2(int field_30_unused2)
-    {
-        this.field_30_unused2 = field_30_unused2;
-    }
-
-    /**
-     * Get the dmOrientPage field for the SEP record.
-     */
-    public byte getDmOrientPage()
-    {
-        return field_31_dmOrientPage;
-    }
-
-    /**
-     * Set the dmOrientPage field for the SEP record.
-     */
-    public void setDmOrientPage(byte field_31_dmOrientPage)
-    {
-        this.field_31_dmOrientPage = field_31_dmOrientPage;
-    }
-
-    /**
-     * Get the iHeadingPgn field for the SEP record.
-     */
-    public byte getIHeadingPgn()
-    {
-        return field_32_iHeadingPgn;
-    }
-
-    /**
-     * Set the iHeadingPgn field for the SEP record.
-     */
-    public void setIHeadingPgn(byte field_32_iHeadingPgn)
-    {
-        this.field_32_iHeadingPgn = field_32_iHeadingPgn;
-    }
-
-    /**
-     * Get the pgnStart field for the SEP record.
-     */
-    public int getPgnStart()
-    {
-        return field_33_pgnStart;
-    }
-
-    /**
-     * Set the pgnStart field for the SEP record.
-     */
-    public void setPgnStart(int field_33_pgnStart)
-    {
-        this.field_33_pgnStart = field_33_pgnStart;
-    }
-
-    /**
-     * Get the lnnMin field for the SEP record.
-     */
-    public int getLnnMin()
-    {
-        return field_34_lnnMin;
-    }
-
-    /**
-     * Set the lnnMin field for the SEP record.
-     */
-    public void setLnnMin(int field_34_lnnMin)
-    {
-        this.field_34_lnnMin = field_34_lnnMin;
-    }
-
-    /**
-     * Get the wTextFlow field for the SEP record.
-     */
-    public int getWTextFlow()
-    {
-        return field_35_wTextFlow;
-    }
-
-    /**
-     * Set the wTextFlow field for the SEP record.
-     */
-    public void setWTextFlow(int field_35_wTextFlow)
-    {
-        this.field_35_wTextFlow = field_35_wTextFlow;
-    }
-
-    /**
-     * Get the unused3 field for the SEP record.
-     */
-    public short getUnused3()
-    {
-        return field_36_unused3;
-    }
-
-    /**
-     * Set the unused3 field for the SEP record.
-     */
-    public void setUnused3(short field_36_unused3)
-    {
-        this.field_36_unused3 = field_36_unused3;
-    }
-
-    /**
-     * Get the pgbProp field for the SEP record.
-     */
-    public int getPgbProp()
-    {
-        return field_37_pgbProp;
-    }
-
-    /**
-     * Set the pgbProp field for the SEP record.
-     */
-    public void setPgbProp(int field_37_pgbProp)
-    {
-        this.field_37_pgbProp = field_37_pgbProp;
-    }
-
-    /**
-     * Get the unused4 field for the SEP record.
-     */
-    public short getUnused4()
-    {
-        return field_38_unused4;
-    }
-
-    /**
-     * Set the unused4 field for the SEP record.
-     */
-    public void setUnused4(short field_38_unused4)
-    {
-        this.field_38_unused4 = field_38_unused4;
-    }
-
-    /**
-     * Get the xaPage field for the SEP record.
-     */
-    public int getXaPage()
-    {
-        return field_39_xaPage;
-    }
-
-    /**
-     * Set the xaPage field for the SEP record.
-     */
-    public void setXaPage(int field_39_xaPage)
-    {
-        this.field_39_xaPage = field_39_xaPage;
-    }
-
-    /**
-     * Get the yaPage field for the SEP record.
-     */
-    public int getYaPage()
-    {
-        return field_40_yaPage;
-    }
-
-    /**
-     * Set the yaPage field for the SEP record.
-     */
-    public void setYaPage(int field_40_yaPage)
-    {
-        this.field_40_yaPage = field_40_yaPage;
-    }
-
-    /**
-     * Get the xaPageNUp field for the SEP record.
-     */
-    public int getXaPageNUp()
-    {
-        return field_41_xaPageNUp;
-    }
-
-    /**
-     * Set the xaPageNUp field for the SEP record.
-     */
-    public void setXaPageNUp(int field_41_xaPageNUp)
-    {
-        this.field_41_xaPageNUp = field_41_xaPageNUp;
-    }
-
-    /**
-     * Get the yaPageNUp field for the SEP record.
-     */
-    public int getYaPageNUp()
-    {
-        return field_42_yaPageNUp;
-    }
-
-    /**
-     * Set the yaPageNUp field for the SEP record.
-     */
-    public void setYaPageNUp(int field_42_yaPageNUp)
-    {
-        this.field_42_yaPageNUp = field_42_yaPageNUp;
-    }
-
-    /**
-     * Get the dxaLeft field for the SEP record.
-     */
-    public int getDxaLeft()
-    {
-        return field_43_dxaLeft;
-    }
-
-    /**
-     * Set the dxaLeft field for the SEP record.
-     */
-    public void setDxaLeft(int field_43_dxaLeft)
-    {
-        this.field_43_dxaLeft = field_43_dxaLeft;
-    }
-
-    /**
-     * Get the dxaRight field for the SEP record.
-     */
-    public int getDxaRight()
-    {
-        return field_44_dxaRight;
-    }
-
-    /**
-     * Set the dxaRight field for the SEP record.
-     */
-    public void setDxaRight(int field_44_dxaRight)
-    {
-        this.field_44_dxaRight = field_44_dxaRight;
-    }
-
-    /**
-     * Get the dyaTop field for the SEP record.
-     */
-    public int getDyaTop()
-    {
-        return field_45_dyaTop;
-    }
-
-    /**
-     * Set the dyaTop field for the SEP record.
-     */
-    public void setDyaTop(int field_45_dyaTop)
-    {
-        this.field_45_dyaTop = field_45_dyaTop;
-    }
-
-    /**
-     * Get the dyaBottom field for the SEP record.
-     */
-    public int getDyaBottom()
-    {
-        return field_46_dyaBottom;
-    }
-
-    /**
-     * Set the dyaBottom field for the SEP record.
-     */
-    public void setDyaBottom(int field_46_dyaBottom)
-    {
-        this.field_46_dyaBottom = field_46_dyaBottom;
-    }
-
-    /**
-     * Get the dzaGutter field for the SEP record.
-     */
-    public int getDzaGutter()
-    {
-        return field_47_dzaGutter;
-    }
-
-    /**
-     * Set the dzaGutter field for the SEP record.
-     */
-    public void setDzaGutter(int field_47_dzaGutter)
-    {
-        this.field_47_dzaGutter = field_47_dzaGutter;
-    }
-
-    /**
-     * Get the dyaHdrTop field for the SEP record.
-     */
-    public int getDyaHdrTop()
-    {
-        return field_48_dyaHdrTop;
-    }
-
-    /**
-     * Set the dyaHdrTop field for the SEP record.
-     */
-    public void setDyaHdrTop(int field_48_dyaHdrTop)
-    {
-        this.field_48_dyaHdrTop = field_48_dyaHdrTop;
-    }
-
-    /**
-     * Get the dyaHdrBottom field for the SEP record.
-     */
-    public int getDyaHdrBottom()
-    {
-        return field_49_dyaHdrBottom;
-    }
-
-    /**
-     * Set the dyaHdrBottom field for the SEP record.
-     */
-    public void setDyaHdrBottom(int field_49_dyaHdrBottom)
-    {
-        this.field_49_dyaHdrBottom = field_49_dyaHdrBottom;
-    }
-
-    /**
-     * Get the ccolM1 field for the SEP record.
-     */
-    public int getCcolM1()
-    {
-        return field_50_ccolM1;
-    }
-
-    /**
-     * Set the ccolM1 field for the SEP record.
-     */
-    public void setCcolM1(int field_50_ccolM1)
-    {
-        this.field_50_ccolM1 = field_50_ccolM1;
-    }
-
-    /**
-     * Get the fEvenlySpaced field for the SEP record.
-     */
-    public boolean getFEvenlySpaced()
-    {
-        return field_51_fEvenlySpaced;
-    }
-
-    /**
-     * Set the fEvenlySpaced field for the SEP record.
-     */
-    public void setFEvenlySpaced(boolean field_51_fEvenlySpaced)
-    {
-        this.field_51_fEvenlySpaced = field_51_fEvenlySpaced;
-    }
-
-    /**
-     * Get the unused5 field for the SEP record.
-     */
-    public byte getUnused5()
-    {
-        return field_52_unused5;
-    }
-
-    /**
-     * Set the unused5 field for the SEP record.
-     */
-    public void setUnused5(byte field_52_unused5)
-    {
-        this.field_52_unused5 = field_52_unused5;
-    }
-
-    /**
-     * Get the dxaColumns field for the SEP record.
-     */
-    public int getDxaColumns()
-    {
-        return field_53_dxaColumns;
-    }
-
-    /**
-     * Set the dxaColumns field for the SEP record.
-     */
-    public void setDxaColumns(int field_53_dxaColumns)
-    {
-        this.field_53_dxaColumns = field_53_dxaColumns;
-    }
-
-    /**
-     * Get the rgdxaColumn field for the SEP record.
-     */
-    public int[] getRgdxaColumn()
-    {
-        return field_54_rgdxaColumn;
-    }
-
-    /**
-     * Set the rgdxaColumn field for the SEP record.
-     */
-    public void setRgdxaColumn(int[] field_54_rgdxaColumn)
-    {
-        this.field_54_rgdxaColumn = field_54_rgdxaColumn;
-    }
-
-    /**
-     * Get the dxaColumnWidth field for the SEP record.
-     */
-    public int getDxaColumnWidth()
-    {
-        return field_55_dxaColumnWidth;
-    }
-
-    /**
-     * Set the dxaColumnWidth field for the SEP record.
-     */
-    public void setDxaColumnWidth(int field_55_dxaColumnWidth)
-    {
-        this.field_55_dxaColumnWidth = field_55_dxaColumnWidth;
-    }
-
-    /**
-     * Get the dmOrientFirst field for the SEP record.
-     */
-    public byte getDmOrientFirst()
-    {
-        return field_56_dmOrientFirst;
-    }
-
-    /**
-     * Set the dmOrientFirst field for the SEP record.
-     */
-    public void setDmOrientFirst(byte field_56_dmOrientFirst)
-    {
-        this.field_56_dmOrientFirst = field_56_dmOrientFirst;
-    }
-
-    /**
-     * Get the fLayout field for the SEP record.
-     */
-    public byte getFLayout()
-    {
-        return field_57_fLayout;
-    }
-
-    /**
-     * Set the fLayout field for the SEP record.
-     */
-    public void setFLayout(byte field_57_fLayout)
-    {
-        this.field_57_fLayout = field_57_fLayout;
-    }
-
-    /**
-     * Get the unused6 field for the SEP record.
-     */
-    public short getUnused6()
-    {
-        return field_58_unused6;
-    }
-
-    /**
-     * Set the unused6 field for the SEP record.
-     */
-    public void setUnused6(short field_58_unused6)
-    {
-        this.field_58_unused6 = field_58_unused6;
-    }
-
-    /**
-     * Get the olstAnm field for the SEP record.
-     */
-    public byte[] getOlstAnm()
-    {
-        return field_59_olstAnm;
-    }
-
-    /**
-     * Set the olstAnm field for the SEP record.
-     */
-    public void setOlstAnm(byte[] field_59_olstAnm)
-    {
-        this.field_59_olstAnm = field_59_olstAnm;
-    }
-
-
-}  // END OF CLASS
-
-
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
deleted file mode 100644
index 9fa50802ed..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Table Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class TAPAbstractType
-    implements HDFType
-{
-
-    private  int field_1_jc;
-    private  int field_2_dxaGapHalf;
-    private  int field_3_dyaRowHeight;
-    private  boolean field_4_fCantSplit;
-    private  boolean field_5_fTableHeader;
-    private  int field_6_tlp;
-    private  short field_7_itcMac;
-    private  short[] field_8_rgdxaCenter;
-    private  TCAbstractType[] field_9_rgtc;
-    private  byte[] field_10_rgshd;
-    private  short[] field_11_brcBottom;
-    private  short[] field_12_brcTop;
-    private  short[] field_13_brcLeft;
-    private  short[] field_14_brcRight;
-    private  short[] field_15_brcVertical;
-    private  short[] field_16_brcHorizontal;
-
-
-    public TAPAbstractType()
-    {
-
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 2 + 4 + 4 + 0 + 0 + 4 + 2 + 130 + 0 + 0 + 4 + 4 + 4 + 4 + 4 + 4;
-    }
-
-
-
-    /**
-     * Get the jc field for the TAP record.
-     */
-    public int getJc()
-    {
-        return field_1_jc;
-    }
-
-    /**
-     * Set the jc field for the TAP record.
-     */
-    public void setJc(int field_1_jc)
-    {
-        this.field_1_jc = field_1_jc;
-    }
-
-    /**
-     * Get the dxaGapHalf field for the TAP record.
-     */
-    public int getDxaGapHalf()
-    {
-        return field_2_dxaGapHalf;
-    }
-
-    /**
-     * Set the dxaGapHalf field for the TAP record.
-     */
-    public void setDxaGapHalf(int field_2_dxaGapHalf)
-    {
-        this.field_2_dxaGapHalf = field_2_dxaGapHalf;
-    }
-
-    /**
-     * Get the dyaRowHeight field for the TAP record.
-     */
-    public int getDyaRowHeight()
-    {
-        return field_3_dyaRowHeight;
-    }
-
-    /**
-     * Set the dyaRowHeight field for the TAP record.
-     */
-    public void setDyaRowHeight(int field_3_dyaRowHeight)
-    {
-        this.field_3_dyaRowHeight = field_3_dyaRowHeight;
-    }
-
-    /**
-     * Get the fCantSplit field for the TAP record.
-     */
-    public boolean getFCantSplit()
-    {
-        return field_4_fCantSplit;
-    }
-
-    /**
-     * Set the fCantSplit field for the TAP record.
-     */
-    public void setFCantSplit(boolean field_4_fCantSplit)
-    {
-        this.field_4_fCantSplit = field_4_fCantSplit;
-    }
-
-    /**
-     * Get the fTableHeader field for the TAP record.
-     */
-    public boolean getFTableHeader()
-    {
-        return field_5_fTableHeader;
-    }
-
-    /**
-     * Set the fTableHeader field for the TAP record.
-     */
-    public void setFTableHeader(boolean field_5_fTableHeader)
-    {
-        this.field_5_fTableHeader = field_5_fTableHeader;
-    }
-
-    /**
-     * Get the tlp field for the TAP record.
-     */
-    public int getTlp()
-    {
-        return field_6_tlp;
-    }
-
-    /**
-     * Set the tlp field for the TAP record.
-     */
-    public void setTlp(int field_6_tlp)
-    {
-        this.field_6_tlp = field_6_tlp;
-    }
-
-    /**
-     * Get the itcMac field for the TAP record.
-     */
-    public short getItcMac()
-    {
-        return field_7_itcMac;
-    }
-
-    /**
-     * Set the itcMac field for the TAP record.
-     */
-    public void setItcMac(short field_7_itcMac)
-    {
-        this.field_7_itcMac = field_7_itcMac;
-    }
-
-    /**
-     * Get the rgdxaCenter field for the TAP record.
-     */
-    public short[] getRgdxaCenter()
-    {
-        return field_8_rgdxaCenter;
-    }
-
-    /**
-     * Set the rgdxaCenter field for the TAP record.
-     */
-    public void setRgdxaCenter(short[] field_8_rgdxaCenter)
-    {
-        this.field_8_rgdxaCenter = field_8_rgdxaCenter;
-    }
-
-    /**
-     * Get the rgtc field for the TAP record.
-     */
-    public TCAbstractType[] getRgtc()
-    {
-        return field_9_rgtc;
-    }
-
-    /**
-     * Set the rgtc field for the TAP record.
-     */
-    public void setRgtc(TCAbstractType[] field_9_rgtc)
-    {
-        this.field_9_rgtc = field_9_rgtc;
-    }
-
-    /**
-     * Get the rgshd field for the TAP record.
-     */
-    public byte[] getRgshd()
-    {
-        return field_10_rgshd;
-    }
-
-    /**
-     * Set the rgshd field for the TAP record.
-     */
-    public void setRgshd(byte[] field_10_rgshd)
-    {
-        this.field_10_rgshd = field_10_rgshd;
-    }
-
-    /**
-     * Get the brcBottom field for the TAP record.
-     */
-    public short[] getBrcBottom()
-    {
-        return field_11_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the TAP record.
-     */
-    public void setBrcBottom(short[] field_11_brcBottom)
-    {
-        this.field_11_brcBottom = field_11_brcBottom;
-    }
-
-    /**
-     * Get the brcTop field for the TAP record.
-     */
-    public short[] getBrcTop()
-    {
-        return field_12_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the TAP record.
-     */
-    public void setBrcTop(short[] field_12_brcTop)
-    {
-        this.field_12_brcTop = field_12_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the TAP record.
-     */
-    public short[] getBrcLeft()
-    {
-        return field_13_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the TAP record.
-     */
-    public void setBrcLeft(short[] field_13_brcLeft)
-    {
-        this.field_13_brcLeft = field_13_brcLeft;
-    }
-
-    /**
-     * Get the brcRight field for the TAP record.
-     */
-    public short[] getBrcRight()
-    {
-        return field_14_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the TAP record.
-     */
-    public void setBrcRight(short[] field_14_brcRight)
-    {
-        this.field_14_brcRight = field_14_brcRight;
-    }
-
-    /**
-     * Get the brcVertical field for the TAP record.
-     */
-    public short[] getBrcVertical()
-    {
-        return field_15_brcVertical;
-    }
-
-    /**
-     * Set the brcVertical field for the TAP record.
-     */
-    public void setBrcVertical(short[] field_15_brcVertical)
-    {
-        this.field_15_brcVertical = field_15_brcVertical;
-    }
-
-    /**
-     * Get the brcHorizontal field for the TAP record.
-     */
-    public short[] getBrcHorizontal()
-    {
-        return field_16_brcHorizontal;
-    }
-
-    /**
-     * Set the brcHorizontal field for the TAP record.
-     */
-    public void setBrcHorizontal(short[] field_16_brcHorizontal)
-    {
-        this.field_16_brcHorizontal = field_16_brcHorizontal;
-    }
-
-
-}  // END OF CLASS
-
-
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
deleted file mode 100644
index 4fba7fe3e7..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/* ====================================================================
-   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.hdf.model.hdftypes.definitions;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.hdf.model.hdftypes.HDFType;
-
-/**
- * Table Cell Descriptor.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-
- * @author S. Ryan Ackley
- */
-@Deprecated
-public abstract class TCAbstractType
-    implements HDFType
-{
-
-    private  short field_1_rgf;
-        private static BitField  fFirstMerged = BitFieldFactory.getInstance(0x0001);
-        private static BitField  fMerged = BitFieldFactory.getInstance(0x0002);
-        private static BitField  fVertical = BitFieldFactory.getInstance(0x0004);
-        private static BitField  fBackward = BitFieldFactory.getInstance(0x0008);
-        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0010);
-        private static BitField  fVertMerge = BitFieldFactory.getInstance(0x0020);
-        private static BitField  fVertRestart = BitFieldFactory.getInstance(0x0040);
-        private static BitField  vertAlign = BitFieldFactory.getInstance(0x0180);
-    private  short field_2_unused;
-    private  short[] field_3_brcTop;
-    private  short[] field_4_brcLeft;
-    private  short[] field_5_brcBottom;
-    private  short[] field_6_brcRight;
-
-
-    public TCAbstractType()
-    {
-
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 +  + 2 + 2 + 4 + 4 + 4 + 4;
-    }
-
-
-
-    /**
-     * Get the rgf field for the TC record.
-     */
-    public short getRgf()
-    {
-        return field_1_rgf;
-    }
-
-    /**
-     * Set the rgf field for the TC record.
-     */
-    public void setRgf(short field_1_rgf)
-    {
-        this.field_1_rgf = field_1_rgf;
-    }
-
-    /**
-     * Get the unused field for the TC record.
-     */
-    public short getUnused()
-    {
-        return field_2_unused;
-    }
-
-    /**
-     * Set the unused field for the TC record.
-     */
-    public void setUnused(short field_2_unused)
-    {
-        this.field_2_unused = field_2_unused;
-    }
-
-    /**
-     * Get the brcTop field for the TC record.
-     */
-    public short[] getBrcTop()
-    {
-        return field_3_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the TC record.
-     */
-    public void setBrcTop(short[] field_3_brcTop)
-    {
-        this.field_3_brcTop = field_3_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the TC record.
-     */
-    public short[] getBrcLeft()
-    {
-        return field_4_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the TC record.
-     */
-    public void setBrcLeft(short[] field_4_brcLeft)
-    {
-        this.field_4_brcLeft = field_4_brcLeft;
-    }
-
-    /**
-     * Get the brcBottom field for the TC record.
-     */
-    public short[] getBrcBottom()
-    {
-        return field_5_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the TC record.
-     */
-    public void setBrcBottom(short[] field_5_brcBottom)
-    {
-        this.field_5_brcBottom = field_5_brcBottom;
-    }
-
-    /**
-     * Get the brcRight field for the TC record.
-     */
-    public short[] getBrcRight()
-    {
-        return field_6_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the TC record.
-     */
-    public void setBrcRight(short[] field_6_brcRight)
-    {
-        this.field_6_brcRight = field_6_brcRight;
-    }
-
-    /**
-     * Sets the fFirstMerged field value.
-     *
-     */
-    public void setFFirstMerged(boolean value)
-    {
-        field_1_rgf = (short)fFirstMerged.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fFirstMerged field value.
-     */
-    public boolean isFFirstMerged()
-    {
-        return fFirstMerged.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fMerged field value.
-     *
-     */
-    public void setFMerged(boolean value)
-    {
-        field_1_rgf = (short)fMerged.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fMerged field value.
-     */
-    public boolean isFMerged()
-    {
-        return fMerged.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fVertical field value.
-     *
-     */
-    public void setFVertical(boolean value)
-    {
-        field_1_rgf = (short)fVertical.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fVertical field value.
-     */
-    public boolean isFVertical()
-    {
-        return fVertical.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fBackward field value.
-     *
-     */
-    public void setFBackward(boolean value)
-    {
-        field_1_rgf = (short)fBackward.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fBackward field value.
-     */
-    public boolean isFBackward()
-    {
-        return fBackward.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fRotateFont field value.
-     *
-     */
-    public void setFRotateFont(boolean value)
-    {
-        field_1_rgf = (short)fRotateFont.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fRotateFont field value.
-     */
-    public boolean isFRotateFont()
-    {
-        return fRotateFont.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fVertMerge field value.
-     *
-     */
-    public void setFVertMerge(boolean value)
-    {
-        field_1_rgf = (short)fVertMerge.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fVertMerge field value.
-     */
-    public boolean isFVertMerge()
-    {
-        return fVertMerge.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the fVertRestart field value.
-     *
-     */
-    public void setFVertRestart(boolean value)
-    {
-        field_1_rgf = (short)fVertRestart.setBoolean(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the fVertRestart field value.
-     */
-    public boolean isFVertRestart()
-    {
-        return fVertRestart.isSet(field_1_rgf);
-
-    }
-
-    /**
-     * Sets the vertAlign field value.
-     *
-     */
-    public void setVertAlign(byte value)
-    {
-        field_1_rgf = (short)vertAlign.setValue(field_1_rgf, value);
-
-
-    }
-
-    /**
-     *
-     * @return  the vertAlign field value.
-     */
-    public byte getVertAlign()
-    {
-        return ( byte )vertAlign.getValue(field_1_rgf);
-
-    }
-
-
-}  // END OF CLASS
-
-
-
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
deleted file mode 100644
index 96cc51d6c3..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/* ====================================================================
-   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.hdf.model.util;
-
-import java.util.*;
-
-import org.apache.poi.hdf.model.hdftypes.PropertyNode;
-
-/*
- * A B-Tree like implementation of the java.util.Set inteface.  This is a modifiable set
- * and thus allows elements to be added and removed.  An instance of java.util.Comparator
- * must be provided at construction else all Objects added to the set must implement
- * java.util.Comparable and must be comparable to one another.  No duplicate elements
- * will be allowed in any BTreeSet in accordance with the specifications of the Set interface.
- * Any attempt to add a null element will result in an IllegalArgumentException being thrown.
- * The java.util.Iterator returned by the iterator method guarantees the elements returned
- * are in ascending order.  The Iterator.remove() method is supported.
- * Comment me
- *
- * @author Ryan Ackley
- *
-*/
-@Deprecated
-public final class BTreeSet extends AbstractSet<PropertyNode>
-{
-
-    /*
-     * Instance Variables
-    */
-    public BTreeNode root;
-    private Comparator<PropertyNode> comparator = null;
-    private int order;
-    int size = 0;
-
-    /*
-     *                             Constructors
-     * A no-arg constructor is supported in accordance with the specifications of the
-     * java.util.Collections interface.  If the order for the B-Tree is not specified
-     * at construction it defaults to 32.
-    */
-
-    public BTreeSet()
-    {
-        this(6);           // Default order for a BTreeSet is 32
-    }
-
-    public BTreeSet(Collection<PropertyNode> c)
-    {
-        this(6);           // Default order for a BTreeSet is 32
-        addAll(c);
-    }
-
-    public BTreeSet(int order)
-    {
-        this(order, null);
-    }
-
-    public BTreeSet(int order, Comparator<PropertyNode> comparator)
-    {
-        this.order = order;
-        this.comparator = comparator;
-        root = new BTreeNode(null);
-    }
-
-
-    /*
-     * Public Methods
-    */
-    public boolean add(PropertyNode x) throws IllegalArgumentException
-    {
-        if (x == null) throw new IllegalArgumentException();
-        return root.insert(x, -1);
-    }
-
-    public boolean contains(PropertyNode x)
-    {
-        return root.includes(x);
-    }
-
-    public boolean remove(PropertyNode x)
-    {
-        if (x == null) return false;
-        return root.delete(x, -1);
-    }
-
-    public int size()
-    {
-        return size;
-    }
-
-    public void clear()
-    {
-        root = new BTreeNode(null);
-        size = 0;
-    }
-
-	public java.util.Iterator<PropertyNode> iterator()
-    {
-        return new Iterator();
-    }
-
-    public static List<PropertyNode> findProperties(int start, int end, BTreeSet.BTreeNode root)
-    {
-      List<PropertyNode> results = new ArrayList<PropertyNode>();
-      BTreeSet.Entry[] entries = root.entries;
-
-      for(int x = 0; x < entries.length; x++)
-      {
-        if(entries[x] != null)
-        {
-          BTreeSet.BTreeNode child = entries[x].child;
-          PropertyNode xNode = entries[x].element;
-          if(xNode != null)
-          {
-            int xStart = xNode.getStart();
-            int xEnd = xNode.getEnd();
-            if(xStart < end)
-            {
-              if(xStart >= start)
-              {
-                if(child != null)
-                {
-                  List<PropertyNode> beforeItems = findProperties(start, end, child);
-                  results.addAll(beforeItems);
-                }
-                results.add(xNode);
-              }
-              else if(start < xEnd)
-              {
-                results.add(xNode);
-                //break;
-              }
-            }
-            else
-            {
-              if(child != null)
-              {
-                List<PropertyNode> beforeItems = findProperties(start, end, child);
-                results.addAll(beforeItems);
-              }
-              break;
-            }
-          }
-          else if(child != null)
-          {
-            List<PropertyNode> afterItems = findProperties(start, end, child);
-            results.addAll(afterItems);
-          }
-        }
-        else
-        {
-          break;
-        }
-      }
-      return results;
-    }
-    /*
-     * Private methods
-    */
-    int compare(PropertyNode x, PropertyNode y)
-    {
-        return (comparator == null ? x.compareTo(y) : comparator.compare(x, y));
-    }
-
-
-
-    /*
-     * Inner Classes
-    */
-
-    /*
-     * Guarantees that the Objects are returned in ascending order.  Due to the volatile
-     * structure of a B-Tree (many splits, steals and merges can happen in a single call to remove)
-     * this Iterator does not attempt to track any concurrent changes that are happening to
-     * it's BTreeSet.  Therefore, after every call to BTreeSet.remove or BTreeSet.add a new
-     * Iterator should be constructed.  If no new Iterator is constructed than there is a
-     * chance of receiving a NullPointerException. The Iterator.delete method is supported.
-    */
-
-    private class Iterator implements java.util.Iterator<PropertyNode>
-    {
-        private int index = 0;
-        private Stack<Integer> parentIndex = new Stack<Integer>(); // Contains all parentIndicies for currentNode
-        private PropertyNode lastReturned = null;
-        private PropertyNode next;
-        private BTreeNode currentNode;
-
-        Iterator()
-        {
-            currentNode = firstNode();
-            next = nextElement();
-        }
-
-        public boolean hasNext()
-        {
-            return next != null;
-        }
-
-        public PropertyNode next()
-        {
-            if (next == null) throw new NoSuchElementException();
-
-            lastReturned = next;
-            next = nextElement();
-            return lastReturned;
-        }
-
-        public void remove()
-        {
-            if (lastReturned == null) throw new NoSuchElementException();
-
-            BTreeSet.this.remove(lastReturned);
-            lastReturned = null;
-        }
-
-        private BTreeNode firstNode()
-        {
-            BTreeNode temp = BTreeSet.this.root;
-
-            while (temp.entries[0].child != null)
-            {
-                temp = temp.entries[0].child;
-                parentIndex.push(Integer.valueOf(0));
-            }
-
-            return temp;
-        }
-
-        private PropertyNode nextElement()
-        {
-            if (currentNode.isLeaf())
-            {
-                if (index < currentNode.nrElements) return currentNode.entries[index++].element;
-
-                else if (!parentIndex.empty())
-                { //All elements have been returned, return successor of lastReturned if it exists
-                    currentNode = currentNode.parent;
-                    index = parentIndex.pop().intValue();
-
-                    while (index == currentNode.nrElements)
-                    {
-                        if (parentIndex.empty()) break;
-                        currentNode = currentNode.parent;
-                        index = parentIndex.pop().intValue();
-                    }
-
-                    if (index == currentNode.nrElements) return null; //Reached root and he has no more children
-                    return currentNode.entries[index++].element;
-                }
-
-                else
-                { //Your a leaf and the root
-                    if (index == currentNode.nrElements) return null;
-                    return currentNode.entries[index++].element;
-                }
-            }
-
-            // else - You're not a leaf so simply find and return the successor of lastReturned
-            currentNode = currentNode.entries[index].child;
-            parentIndex.push(Integer.valueOf(index));
-
-            while (currentNode.entries[0].child != null)
-            {
-                currentNode = currentNode.entries[0].child;
-                parentIndex.push(Integer.valueOf(0));
-            }
-
-            index = 1;
-            return currentNode.entries[0].element;
-        }
-    }
-
-
-    public static class Entry
-    {
-
-        public PropertyNode element;
-        public BTreeNode child;
-    }
-
-
-    public class BTreeNode
-    {
-
-        public Entry[] entries;
-        public BTreeNode parent;
-        private int nrElements = 0;
-        private final int MIN = (BTreeSet.this.order - 1) / 2;
-
-        BTreeNode(BTreeNode parent)
-        {
-            this.parent = parent;
-            entries = new Entry[BTreeSet.this.order];
-            entries[0] = new Entry();
-        }
-
-        boolean insert(PropertyNode x, int parentIndex)
-        {
-            if (isFull())
-            { // If full, you must split and promote splitNode before inserting
-            	PropertyNode splitNode = entries[nrElements / 2].element;
-                BTreeNode rightSibling = split();
-
-                if (isRoot())
-                { // Grow a level
-                    splitRoot(splitNode, this, rightSibling);
-                    // Determine where to insert
-                    if (BTreeSet.this.compare(x, BTreeSet.this.root.entries[0].element) < 0) insert(x, 0);
-                    else rightSibling.insert(x, 1);
-                }
-
-                else
-                { // Promote splitNode
-                    parent.insertSplitNode(splitNode, this, rightSibling, parentIndex);
-                    if (BTreeSet.this.compare(x, parent.entries[parentIndex].element) < 0) {
-                        return insert(x, parentIndex);
-                    }
-                    return rightSibling.insert(x, parentIndex + 1);
-                }
-            }
-
-            else if (isLeaf())
-            { // If leaf, simply insert the non-duplicate element
-                int insertAt = childToInsertAt(x, true);
-                // Determine if the element already exists
-                if (insertAt == -1) {
-                    return false;
-                }
-                insertNewElement(x, insertAt);
-                BTreeSet.this.size++;
-                return true;
-            }
-
-            else
-            { // If not full and not leaf recursively find correct node to insert at
-                int insertAt = childToInsertAt(x, true);
-                return (insertAt == -1 ? false : entries[insertAt].child.insert(x, insertAt));
-            }
-            return false;
-        }
-
-        boolean includes(PropertyNode x)
-        {
-            int index = childToInsertAt(x, true);
-            if (index == -1) return true;
-            if (entries[index] == null || entries[index].child == null) return false;
-            return entries[index].child.includes(x);
-        }
-
-        boolean delete(PropertyNode x, int parentIndex)
-        {
-            int i = childToInsertAt(x, true);
-            int priorParentIndex = parentIndex;
-            BTreeNode temp = this;
-            if (i != -1)
-            {
-                do
-                {
-                    if (temp.entries[i] == null || temp.entries[i].child == null) return false;
-                    temp = temp.entries[i].child;
-                    priorParentIndex = parentIndex;
-                    parentIndex = i;
-                    i = temp.childToInsertAt(x, true);
-                } while (i != -1);
-            } // Now temp contains element to delete and temp's parentIndex is parentIndex
-
-            if (temp.isLeaf())
-            { // If leaf and have more than MIN elements, simply delete
-                if (temp.nrElements > MIN)
-                {
-                    temp.deleteElement(x);
-                    BTreeSet.this.size--;
-                    return true;
-                }
-
-                // else - If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
-                temp.prepareForDeletion(parentIndex);
-                temp.deleteElement(x);
-                BTreeSet.this.size--;
-                temp.fixAfterDeletion(priorParentIndex);
-                return true;
-            }
-
-            // else - Only delete at leaf so first switch with successor than delete
-            temp.switchWithSuccessor(x);
-            parentIndex = temp.childToInsertAt(x, false) + 1;
-            return temp.entries[parentIndex].child.delete(x, parentIndex);
-
-        }
-
-
-        private boolean isFull() { return nrElements == (BTreeSet.this.order - 1); }
-
-        private boolean isLeaf() { return entries[0].child == null; }
-
-        private boolean isRoot() { return parent == null; }
-
-        /*
-         * Splits a BTreeNode into two BTreeNodes, removing the splitNode from the
-         * calling BTreeNode.
-        */
-        private BTreeNode split()
-        {
-            BTreeNode rightSibling = new BTreeNode(parent);
-            int index = nrElements / 2;
-            entries[index++].element = null;
-
-            for (int i = 0, nr = nrElements; index <= nr; i++, index++)
-            {
-                rightSibling.entries[i] = entries[index];
-                if (rightSibling.entries[i] != null && rightSibling.entries[i].child != null)
-                    rightSibling.entries[i].child.parent = rightSibling;
-                entries[index] = null;
-                nrElements--;
-                rightSibling.nrElements++;
-            }
-
-            rightSibling.nrElements--; // Need to correct for copying the last Entry which has a null element and a child
-            return rightSibling;
-        }
-
-        /*
-         * Creates a new BTreeSet.root which contains only the splitNode and pointers
-         * to it's left and right child.
-        */
-        private void splitRoot(PropertyNode splitNode, BTreeNode left, BTreeNode right)
-        {
-            BTreeNode newRoot = new BTreeNode(null);
-            newRoot.entries[0].element = splitNode;
-            newRoot.entries[0].child = left;
-            newRoot.entries[1] = new Entry();
-            newRoot.entries[1].child = right;
-            newRoot.nrElements = 1;
-            left.parent = right.parent = newRoot;
-            BTreeSet.this.root = newRoot;
-        }
-
-        private void insertSplitNode(PropertyNode splitNode, BTreeNode left, BTreeNode right, int insertAt)
-        {
-            for (int i = nrElements; i >= insertAt; i--) entries[i + 1] = entries[i];
-
-            entries[insertAt] = new Entry();
-            entries[insertAt].element = splitNode;
-            entries[insertAt].child = left;
-            entries[insertAt + 1].child = right;
-
-            nrElements++;
-        }
-
-        private void insertNewElement(PropertyNode x, int insertAt)
-        {
-
-            for (int i = nrElements; i > insertAt; i--) entries[i] = entries[i - 1];
-
-            entries[insertAt] = new Entry();
-            entries[insertAt].element = x;
-
-            nrElements++;
-        }
-
-        /*
-         * Possibly a deceptive name for a pretty cool method.  Uses binary search
-         * to determine the postion in entries[] in which to traverse to find the correct
-         * BTreeNode in which to insert a new element.  If the element exists in the calling
-         * BTreeNode than -1 is returned.  When the parameter position is true and the element
-         * is present in the calling BTreeNode -1 is returned, if position is false and the
-         * element is contained in the calling BTreeNode than the position of the element
-         * in entries[] is returned.
-        */
-        private int childToInsertAt(PropertyNode x, boolean position)
-        {
-            int index = nrElements / 2;
-
-            if (entries[index] == null || entries[index].element == null) return index;
-
-            int lo = 0, hi = nrElements - 1;
-            while (lo <= hi)
-            {
-                if (BTreeSet.this.compare(x, entries[index].element) > 0)
-                {
-                    lo = index + 1;
-                    index = (hi + lo) / 2;
-                }
-                else
-                {
-                    hi = index - 1;
-                    index = (hi + lo) / 2;
-                }
-            }
-
-            hi++;
-            if (entries[hi] == null || entries[hi].element == null) return hi;
-            return (!position ? hi : BTreeSet.this.compare(x, entries[hi].element) == 0 ? -1 : hi);
-        }
-
-
-        private void deleteElement(PropertyNode x)
-        {
-            int index = childToInsertAt(x, false);
-            for (; index < (nrElements - 1); index++) entries[index] = entries[index + 1];
-
-            if (nrElements == 1) entries[index] = new Entry(); // This is root and it is empty
-            else entries[index] = null;
-
-            nrElements--;
-        }
-
-        private void prepareForDeletion(int parentIndex)
-        {
-            if (isRoot()) return; // Don't attempt to steal or merge if your the root
-
-            // If not root then try to steal left
-            else if (parentIndex != 0 && parent.entries[parentIndex - 1].child.nrElements > MIN)
-            {
-                stealLeft(parentIndex);
-                return;
-            }
-
-            // If not root and can't steal left try to steal right
-            else if (parentIndex < entries.length && parent.entries[parentIndex + 1] != null && parent.entries[parentIndex + 1].child != null && parent.entries[parentIndex + 1].child.nrElements > MIN)
-            {
-                    stealRight(parentIndex);
-                    return;
-            }
-
-            // If not root and can't steal left or right then try to merge left
-            else if (parentIndex != 0) {
-                mergeLeft(parentIndex);
-                return;
-            }
-
-            // If not root and can't steal left or right and can't merge left you must be able to merge right
-            else mergeRight(parentIndex);
-        }
-
-        private void fixAfterDeletion(int parentIndex)
-        {
-            if (isRoot() || parent.isRoot()) return; // No fixing needed
-
-            if (parent.nrElements < MIN)
-            { // If parent lost it's n/2 element repair it
-                BTreeNode temp = parent;
-                temp.prepareForDeletion(parentIndex);
-                if (temp.parent == null) return; // Root changed
-                if (!temp.parent.isRoot() && temp.parent.nrElements < MIN)
-                { // If need be recurse
-                    BTreeNode x = temp.parent.parent;
-                    int i = 0;
-                    // Find parent's parentIndex
-                    for (; i < entries.length; i++) if (x.entries[i].child == temp.parent) break;
-                    temp.parent.fixAfterDeletion(i);
-                }
-            }
-        }
-
-        private void switchWithSuccessor(PropertyNode x)
-        {
-            int index = childToInsertAt(x, false);
-            BTreeNode temp = entries[index + 1].child;
-            while (temp.entries[0] != null && temp.entries[0].child != null) temp = temp.entries[0].child;
-            PropertyNode successor = temp.entries[0].element;
-            temp.entries[0].element = entries[index].element;
-            entries[index].element = successor;
-        }
-
-        /*
-         * This method is called only when the BTreeNode has the minimum number of elements,
-         * has a leftSibling, and the leftSibling has more than the minimum number of elements.
-        */
-        private void stealLeft(int parentIndex)
-        {
-            BTreeNode p = parent;
-            BTreeNode ls = parent.entries[parentIndex - 1].child;
-
-            if (isLeaf())
-            { // When stealing from leaf to leaf don't worry about children
-                int add = childToInsertAt(p.entries[parentIndex - 1].element, true);
-                insertNewElement(p.entries[parentIndex - 1].element, add);
-                p.entries[parentIndex - 1].element = ls.entries[ls.nrElements - 1].element;
-                ls.entries[ls.nrElements - 1] = null;
-                ls.nrElements--;
-            }
-
-            else
-            { // Was called recursively to fix an undermanned parent
-                entries[0].element = p.entries[parentIndex - 1].element;
-                p.entries[parentIndex - 1].element = ls.entries[ls.nrElements - 1].element;
-                entries[0].child = ls.entries[ls.nrElements].child;
-                entries[0].child.parent = this;
-                ls.entries[ls.nrElements] = null;
-                ls.entries[ls.nrElements - 1].element = null;
-                nrElements++;
-                ls.nrElements--;
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft can't be called, the BTreeNode
-         * has the minimum number of elements, has a rightSibling, and the rightSibling
-         * has more than the minimum number of elements.
-        */
-        private void stealRight(int parentIndex)
-        {
-            BTreeNode p = parent;
-            BTreeNode rs = p.entries[parentIndex + 1].child;
-
-            if (isLeaf())
-            { // When stealing from leaf to leaf don't worry about children
-                entries[nrElements] = new Entry();
-                entries[nrElements].element = p.entries[parentIndex].element;
-                p.entries[parentIndex].element = rs.entries[0].element;
-                for (int i = 0; i < rs.nrElements; i++) rs.entries[i] = rs.entries[i + 1];
-                rs.entries[rs.nrElements - 1] = null;
-                nrElements++;
-                rs.nrElements--;
-            }
-
-            else
-            { // Was called recursively to fix an undermanned parent
-                for (int i = 0; i <= nrElements; i++) entries[i] = entries[i + 1];
-                entries[nrElements].element = p.entries[parentIndex].element;
-                p.entries[parentIndex].element = rs.entries[0].element;
-                entries[nrElements + 1] = new Entry();
-                entries[nrElements + 1].child = rs.entries[0].child;
-                entries[nrElements + 1].child.parent = this;
-                for (int i = 0; i <= rs.nrElements; i++) rs.entries[i] = rs.entries[i + 1];
-                rs.entries[rs.nrElements] = null;
-                nrElements++;
-                rs.nrElements--;
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft and stealRight could not be called,
-         * the BTreeNode has the minimum number of elements, has a leftSibling, and the
-         * leftSibling has more than the minimum number of elements.  If after completion
-         * parent has fewer than the minimum number of elements than the parents entries[0]
-         * slot is left empty in anticipation of a recursive call to stealLeft, stealRight,
-         * mergeLeft, or mergeRight to fix the parent. All of the before-mentioned methods
-         * expect the parent to be in such a condition.
-        */
-        private void mergeLeft(int parentIndex)
-        {
-            BTreeNode p = parent;
-            BTreeNode ls = p.entries[parentIndex - 1].child;
-
-            if (isLeaf())
-            { // Don't worry about children
-                int add = childToInsertAt(p.entries[parentIndex - 1].element, true);
-                insertNewElement(p.entries[parentIndex - 1].element, add); // Could have been a successor switch
-                p.entries[parentIndex - 1].element = null;
-
-                for (int i = nrElements - 1, nr = ls.nrElements; i >= 0; i--)
-                    entries[i + nr] = entries[i];
-
-                for (int i = ls.nrElements - 1; i >= 0; i--)
-                {
-                    entries[i] = ls.entries[i];
-                    nrElements++;
-                }
-
-                if (p.nrElements == MIN && p != BTreeSet.this.root)
-                {
-
-                    for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
-                        p.entries[x] = p.entries[y];
-                    p.entries[0] = new Entry();
-                    p.entries[0].child = ls; //So p doesn't think it's a leaf this will be deleted in the next recursive call
-                }
-
-                else
-                {
-
-                    for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
-                        p.entries[x] = p.entries[y];
-                    p.entries[p.nrElements] = null;
-                }
-
-                p.nrElements--;
-
-                if (p.isRoot() && p.nrElements == 0)
-                { // It's the root and it's empty
-                    BTreeSet.this.root = this;
-                    parent = null;
-                }
-            }
-
-            else
-            { // I'm not a leaf but fixing the tree structure
-                entries[0].element = p.entries[parentIndex - 1].element;
-                entries[0].child = ls.entries[ls.nrElements].child;
-                nrElements++;
-
-                for (int x = nrElements, nr = ls.nrElements; x >= 0; x--)
-                    entries[x + nr] = entries[x];
-
-                for (int x = ls.nrElements - 1; x >= 0; x--)
-                {
-                    entries[x] = ls.entries[x];
-                    entries[x].child.parent = this;
-                    nrElements++;
-                }
-
-                if (p.nrElements == MIN && p != BTreeSet.this.root)
-                { // Push everything to the right
-                    for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x++, y++)
-                    {
-                        System.out.println(x + " " + y);
-                        p.entries[x] = p.entries[y];
-                    }
-                    p.entries[0] = new Entry();
-                }
-
-                else
-                { // Either p.nrElements > MIN or p == BTreeSet.this.root so push everything to the left
-                    for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
-                        p.entries[x] = p.entries[y];
-                    p.entries[p.nrElements] = null;
-                }
-
-                p.nrElements--;
-
-                if (p.isRoot() && p.nrElements == 0)
-                { // p == BTreeSet.this.root and it's empty
-                    BTreeSet.this.root = this;
-                    parent = null;
-                }
-            }
-        }
-
-        /*
-         * This method is called only when stealLeft, stealRight, and mergeLeft could not be called,
-         * the BTreeNode has the minimum number of elements, has a rightSibling, and the
-         * rightSibling has more than the minimum number of elements.  If after completion
-         * parent has fewer than the minimum number of elements than the parents entries[0]
-         * slot is left empty in anticipation of a recursive call to stealLeft, stealRight,
-         * mergeLeft, or mergeRight to fix the parent. All of the before-mentioned methods
-         * expect the parent to be in such a condition.
-        */
-        private void mergeRight(int parentIndex)
-        {
-            BTreeNode p = parent;
-            BTreeNode rs = p.entries[parentIndex + 1].child;
-
-            if (isLeaf())
-            { // Don't worry about children
-                entries[nrElements] = new Entry();
-                entries[nrElements].element = p.entries[parentIndex].element;
-                nrElements++;
-                for (int i = 0, nr = nrElements; i < rs.nrElements; i++, nr++)
-                {
-                    entries[nr] = rs.entries[i];
-                    nrElements++;
-                }
-                p.entries[parentIndex].element = p.entries[parentIndex + 1].element;
-                if (p.nrElements == MIN && p != BTreeSet.this.root)
-                {
-                    for (int x = parentIndex + 1, y = parentIndex; y >= 0; x--, y--)
-                        p.entries[x] = p.entries[y];
-                    p.entries[0] = new Entry();
-                    p.entries[0].child = rs; // So it doesn't think it's a leaf, this child will be deleted in the next recursive call
-                }
-
-                else
-                {
-                    for (int x = parentIndex + 1, y = parentIndex + 2; y <= p.nrElements; x++, y++)
-                        p.entries[x] = p.entries[y];
-                    p.entries[p.nrElements] = null;
-                }
-
-                p.nrElements--;
-                if (p.isRoot() && p.nrElements == 0)
-                { // It's the root and it's empty
-                    BTreeSet.this.root = this;
-                    parent = null;
-                }
-           }
-
-           else
-           { // It's not a leaf
-
-               entries[nrElements].element = p.entries[parentIndex].element;
-               nrElements++;
-
-               for (int x = nrElements + 1, y = 0; y <= rs.nrElements; x++, y++)
-               {
-                   entries[x] = rs.entries[y];
-                   rs.entries[y].child.parent = this;
-                   nrElements++;
-               }
-               nrElements--;
-
-               p.entries[++parentIndex].child = this;
-
-               if (p.nrElements == MIN && p != BTreeSet.this.root)
-               {
-                  for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
-                      p.entries[x] = p.entries[y];
-                  p.entries[0] = new Entry();
-               }
-
-               else
-               {
-                   for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
-                       p.entries[x] = p.entries[y];
-                   p.entries[p.nrElements] = null;
-               }
-
-               p.nrElements--;
-
-               if (p.isRoot() && p.nrElements == 0)
-               { // It's the root and it's empty
-                   BTreeSet.this.root = this;
-                   parent = null;
-               }
-            }
-        }
-  }
-
-}
-
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
deleted file mode 100644
index eac3b2df9c..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   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.hdf.model.util;
-
-import java.util.Locale;
-
-/**
- * TODO Comment me
- */
-@Deprecated
-public final class NumberFormatter
-{
-  private final static int ARABIC = 0;
-  private final static int UPPER_ROMAN = 1;
-  private final static int LOWER_ROMAN = 2;
-  private final static int UPPER_LETTER = 3;
-  private final static int LOWER_LETTER = 4;
-  private final static int ORDINAL = 5;
-
-  private static String[] _arabic = new String[] {"1", "2", "3", "4", "5", "6",
-                                                  "7", "8", "9", "10", "11", "12",
-                                                  "13", "14", "15", "16", "17", "18",
-                                                  "19", "20", "21", "22", "23",
-                                                  "24", "25", "26", "27", "28",
-                                                  "29", "30", "31", "32", "33",
-                                                  "34", "35", "36", "37", "38",
-                                                  "39", "40", "41", "42", "43",
-                                                  "44", "45", "46", "47", "48",
-                                                  "49", "50", "51", "52", "53"};
-  private static String[] _roman = new String[]{"i", "ii", "iii", "iv", "v", "vi",
-                                                "vii", "viii", "ix", "x", "xi", "xii",
-                                                "xiii","xiv", "xv", "xvi", "xvii",
-                                                "xviii", "xix", "xx", "xxi", "xxii",
-                                                "xxiii", "xxiv", "xxv", "xxvi",
-                                                "xxvii", "xxviii", "xxix", "xxx",
-                                                "xxxi", "xxxii", "xxxiii", "xxxiv",
-                                                "xxxv", "xxxvi", "xxxvii", "xxxvii",
-                                                "xxxviii", "xxxix", "xl", "xli", "xlii",
-                                                "xliii", "xliv", "xlv", "xlvi", "xlvii",
-                                                "xlviii", "xlix", "l"};
-  private static String[] _letter = new String[]{"a", "b", "c", "d", "e", "f", "g",
-                                                 "h", "i", "j", "k", "l", "m", "n",
-                                                 "o", "p", "q", "r", "s", "t", "u",
-                                                 "v", "x", "y", "z"};
-  public NumberFormatter()
-  {
-  }
-  public static String getNumber(int num, int style)
-  {
-    switch(style)
-    {
-      case ARABIC:
-        return _arabic[num - 1];
-      case UPPER_ROMAN:
-        return _roman[num-1].toUpperCase(Locale.ROOT);
-      case LOWER_ROMAN:
-        return _roman[num-1];
-      case UPPER_LETTER:
-        return _letter[num-1].toUpperCase(Locale.ROOT);
-      case LOWER_LETTER:
-        return _letter[num-1];
-      case ORDINAL:
-        return _arabic[num - 1];
-      default:
-        return _arabic[num - 1];
-    }
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
deleted file mode 100644
index 70b39d0ef4..0000000000
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   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.hdf.model.util;
-
-import org.apache.poi.hdf.model.hdftypes.FormattedDiskPage;
-
-@Deprecated
-public final class ParsingState
-{
-
-  //int _numPages;// = charPlcf.length();
-  int _currentPageIndex = 0;
-  FormattedDiskPage _fkp;// = new CHPFormattedDiskPage(fkp);
-  int _currentPropIndex = 0;
-  //int _currentArraySize;// = cfkp.size();
-
-  public ParsingState(int firstPage, FormattedDiskPage fkp)
-  {
-    _fkp = fkp;
-  }
-  //public int getCurrentPage()
-  //{
-  //  return _currentPage;
-  //}
-  //public int getNumPages()
-  //{
-  //  return _numPages;
-  //}
-  public int getCurrentPageIndex()
-  {
-    return _currentPageIndex;
-  }
-  public FormattedDiskPage getFkp()
-  {
-    return _fkp;
-  }
-  public int getCurrentPropIndex()
-  {
-    return _currentPropIndex;
-  }
-
-  public void setState(int currentPageIndex, FormattedDiskPage fkp, int currentPropIndex)
-  {
-
-    _currentPageIndex = currentPageIndex;
-    _fkp = fkp;
-    _currentPropIndex = currentPropIndex;
-    //_currentArraySize = currentArraySize;
-  }
-}
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
index b2a42536c3..23ec352783 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
+++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
@@ -23,7 +23,6 @@ import org.apache.poi.hdgf.chunks.ChunkFactory.CommandDefinition;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
 
 /**
  * Base of all chunks, which hold data, flags etc
@@ -55,7 +54,7 @@ public final class Chunk {
 		this.header = header;
 		this.trailer = trailer;
 		this.separator = separator;
-		this.contents = contents;
+		this.contents = contents.clone();
 	}
 
 	public byte[] _getContents() {
@@ -116,14 +115,14 @@ public final class Chunk {
 
 		// Loop over the definitions, building the commands
 		//  and getting their values
-		ArrayList<Command> commands = new ArrayList<Command>();
-		for(int i=0; i<commandDefinitions.length; i++) {
-			int type = commandDefinitions[i].getType();
-			int offset = commandDefinitions[i].getOffset();
+		ArrayList<Command> commandList = new ArrayList<Command>();
+		for(CommandDefinition cdef : commandDefinitions) {
+			int type = cdef.getType();
+			int offset = cdef.getOffset();
 
 			// Handle virtual commands
 			if(type == 10) {
-				name = commandDefinitions[i].getName();
+				name = cdef.getName();
 				continue;
 			} else if(type == 18) {
 				continue;
@@ -133,9 +132,9 @@ public final class Chunk {
 			// Build the appropriate command for the type
 			Command command;
 			if(type == 11 || type == 21) {
-				command = new BlockOffsetCommand(commandDefinitions[i]);
+				command = new BlockOffsetCommand(cdef);
 			} else {
-				command = new Command(commandDefinitions[i]);
+				command = new Command(cdef);
 			}
 
 			// Bizarely, many of the offsets are from the start of the
@@ -234,12 +233,12 @@ public final class Chunk {
 			}
 
 			// Add to the array
-			commands.add(command);
+			commandList.add(command);
 		}
 
 		// Save the commands we liked the look of
-		this.commands = commands.toArray(
-							new Command[commands.size()] );
+		this.commands = commandList.toArray(
+							new Command[commandList.size()] );
 
 		// Now build up the blocks, if we had a command that tells
 		//  us where a block is
@@ -280,13 +279,11 @@ public final class Chunk {
 	 * A special kind of command that holds the offset to
 	 *  a block
 	 */
-	public static class BlockOffsetCommand extends Command {
-		private int offset;
+	private static class BlockOffsetCommand extends Command {
 		private BlockOffsetCommand(CommandDefinition definition) {
 			super(definition, null);
 		}
 		private void setOffset(int offset) {
-			this.offset = offset;
 			value = Integer.valueOf(offset);
 		}
 	}
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
index f4e9fab559..7f27de3e3b 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
+++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
@@ -49,7 +49,7 @@ public class MAPIAttribute {
    public MAPIAttribute(MAPIProperty property, int type, byte[] data) {
       this.property = property;
       this.type = type;
-      this.data = data;
+      this.data = data.clone();
    }
 
    public MAPIProperty getProperty() {
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java b/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
index ebbc3377ce..c2e5334f08 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
+++ b/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
@@ -34,7 +34,7 @@ public abstract class QCBit {
 	public QCBit(String thingType, String bitType, byte[] data) {
 		this.thingType = thingType;
 		this.bitType = bitType;
-		this.data = data;
+		this.data = data.clone();
 	}
 
 	/**
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
index 2987314508..62b757f453 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
@@ -19,18 +19,18 @@ package org.apache.poi.hslf.dev;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.PrintStream;
 import java.util.Locale;
 
 import org.apache.poi.ddf.DefaultEscherRecordFactory;
 import org.apache.poi.ddf.EscherContainerRecord;
 import org.apache.poi.ddf.EscherRecord;
 import org.apache.poi.ddf.EscherTextboxRecord;
+import org.apache.poi.hslf.record.HSLFEscherRecordFactory;
 import org.apache.poi.hslf.record.RecordTypes;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.hslf.record.HSLFEscherRecordFactory;
-import org.apache.poi.hslf.record.RecordTypes;
+import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -46,14 +46,14 @@ import org.apache.poi.util.LittleEndian;
  *  from hslf.record.RecordTypes also)
  */
 public final class SlideShowDumper {
-  private NPOIFSFileSystem filesystem;
-
-  private byte[] _docstream;
+  private byte[] docstream;
 
   /** Do we try to use DDF to understand the escher objects? */
   private boolean ddfEscher = false;
   /** Do we use our own built-in basic escher groker to understand the escher objects? */
   private boolean basicEscher = false;
+  
+  private PrintStream out;
 
   /**
    *  right now this function takes one parameter: a ppt file, and outputs
@@ -71,7 +71,9 @@ public final class SlideShowDumper {
 		filename = args[1];
 	}
 
-	SlideShowDumper foo = new SlideShowDumper(filename);
+	NPOIFSFileSystem poifs = new NPOIFSFileSystem(new File(filename));
+	SlideShowDumper foo = new SlideShowDumper(poifs, System.out);
+    poifs.close();
 
 	if(args.length > 1) {
 		if(args[0].equalsIgnoreCase("-escher")) {
@@ -82,33 +84,6 @@ public final class SlideShowDumper {
 	}
 
 	foo.printDump();
-	foo.close();
-  }
-
-
-  /**
-   * Constructs a Powerpoint dump from fileName. Parses the document
-   * and dumps out the contents
-   *
-   * @param fileName The name of the file to read.
-   * @throws IOException if there is a problem while parsing the document.
-   */
-  public SlideShowDumper(String fileName) throws IOException
-  {
-  	this(new NPOIFSFileSystem(new File(fileName)));
-  }
-
-  /**
-   * Constructs a Powerpoint dump from an input stream. Parses the
-   * document and dumps out the contents
-   *
-   * @param inputStream the source of the data
-   * @throws IOException if there is a problem while parsing the document.
-   */
-  public SlideShowDumper(InputStream inputStream) throws IOException
-  {
-	//do Ole stuff
-	this(new NPOIFSFileSystem(inputStream));
   }
 
   /**
@@ -118,17 +93,15 @@ public final class SlideShowDumper {
    * @param filesystem the POIFS FileSystem to read from
    * @throws IOException if there is a problem while parsing the document.
    */
-  public SlideShowDumper(NPOIFSFileSystem filesystem) throws IOException
-  {
-	this.filesystem = filesystem;
-
+  public SlideShowDumper(NPOIFSFileSystem filesystem, PrintStream out) throws IOException {
 	// Get the main document stream
 	DocumentEntry docProps =
 		(DocumentEntry)filesystem.getRoot().getEntry("PowerPoint Document");
 
 	// Grab the document stream
-	_docstream = new byte[docProps.getSize()];
-	filesystem.createDocumentInputStream("PowerPoint Document").read(_docstream);
+	docstream = new byte[docProps.getSize()];
+	filesystem.createDocumentInputStream("PowerPoint Document").read(docstream);
+	this.out = out;
   }
 
   /**
@@ -148,18 +121,7 @@ public final class SlideShowDumper {
 	ddfEscher = !(grok);
   }
 
-  /**
-   * Shuts things down. Closes underlying streams etc
-   *
-   * @throws IOException
-   */
-  public void close() throws IOException
-  {
-	filesystem.close();
-  }
-
-
-  public void printDump() {
+  public void printDump() throws IOException {
 	// The format of records in a powerpoint file are:
 	//   <little endian 2 byte "info">
 	//   <little endian 2 byte "type">
@@ -189,75 +151,53 @@ public final class SlideShowDumper {
 	//  0x0f (15) and get back 0x0f, you know it has children. Otherwise
 	//  it doesn't
 
-	walkTree(0,0,_docstream.length);
-}
-
-public String makeHex(short s) {
-	String hex = Integer.toHexString(s).toUpperCase(Locale.ROOT);
-	if(hex.length() == 1) { return "0" + hex; }
-	return hex;
-}
-public String makeHex(int i) {
-	String hex = Integer.toHexString(i).toUpperCase(Locale.ROOT);
-	if(hex.length() == 1) { return "000" + hex; }
-	if(hex.length() == 2) { return "00" + hex; }
-	if(hex.length() == 3) { return "0" + hex; }
-	return hex;
+	walkTree(0,0,docstream.length);
 }
 
-public void walkTree(int depth, int startPos, int maxLen) {
+public void walkTree(int depth, int startPos, int maxLen) throws IOException {
 	int pos = startPos;
 	int endPos = startPos + maxLen;
-	int indent = depth;
+	final String ind = (depth == 0) ? "%1$s" : "%1$"+depth+"s";
 	while(pos <= endPos - 8) {
-		long type = LittleEndian.getUShort(_docstream,pos+2);
-		long len = LittleEndian.getUInt(_docstream,pos+4);
-		byte opt = _docstream[pos];
-
-		String ind = "";
-		for(int i=0; i<indent; i++) { ind += " "; }
+		long type = LittleEndian.getUShort(docstream,pos+2);
+		long len = LittleEndian.getUInt(docstream,pos+4);
+		byte opt = docstream[pos];
 
-		System.out.println(ind + "At position " + pos + " (" + makeHex(pos) + "):");
-		System.out.println(ind + "Type is " + type + " (" + makeHex((int)type) + "), len is " + len + " (" + makeHex((int)len) + ")");
+		String fmt = ind+"At position %2$d (%2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x)";
+		out.println(String.format(Locale.ROOT, fmt, "", pos, type, len));
 
 		// See if we know about the type of it
 		String recordName = RecordTypes.recordName((int)type);
 
 		// Jump over header, and think about going on more
 		pos += 8;
-		if(recordName != null) {
-			System.out.println(ind + "That's a " + recordName);
-
-			// Now check if it's a container or not
-			int container = opt & 0x0f;
-
-			// BinaryTagData seems to contain records, but it
-			//  isn't tagged as doing so. Try stepping in anyway
-			if(type == 5003L && opt == 0L) {
-				container = 0x0f;
-			}
-
-			if(type == 0L || (container != 0x0f)) {
-				System.out.println();
-			} else if (type == 1035l || type == 1036l) {
-				// Special Handling of 1035=PPDrawingGroup and 1036=PPDrawing
-				System.out.println();
-
-				if(ddfEscher) {
-					// Seems to be:
-					walkEscherDDF((indent+3),pos+8,(int)len-8);
-				} else if(basicEscher) {
-					walkEscherBasic((indent+3),pos+8,(int)len-8);
-				}
-			} else {
-				// General container record handling code
-				System.out.println();
-				walkTree((indent+2),pos,(int)len);
-			}
-		} else {
-			System.out.println(ind + "** unknown record **");
-			System.out.println();
+		out.println(String.format(Locale.ROOT, ind+"That's a %2$s", "", recordName));
+
+		// Now check if it's a container or not
+		int container = opt & 0x0f;
+
+		// BinaryTagData seems to contain records, but it
+		//  isn't tagged as doing so. Try stepping in anyway
+		if(type == 5003L && opt == 0L) {
+			container = 0x0f;
+		}
+
+        out.println();
+		if (type != 0L && container == 0x0f) {
+		    if (type == 1035l || type == 1036l) {
+    			// Special Handling of 1035=PPDrawingGroup and 1036=PPDrawing
+    			if(ddfEscher) {
+    				// Seems to be:
+    				walkEscherDDF((depth+3),pos+8,(int)len-8);
+    			} else if(basicEscher) {
+    				walkEscherBasic((depth+3),pos+8,(int)len-8);
+    			}
+    		} else {
+    			// General container record handling code
+    			walkTree((depth+2),pos,(int)len);
+    		}
 		}
+
 		pos += (int)len;
 	}
   }
@@ -268,11 +208,10 @@ public void walkTree(int depth, int startPos, int maxLen) {
   public void walkEscherDDF(int indent, int pos, int len) {
 	if(len < 8) { return; }
 
-	String ind = "";
-	for(int i=0; i<indent; i++) { ind += " "; }
+	final String ind = (indent == 0) ? "%1$s" : "%1$"+indent+"s";
 
 	byte[] contents = new byte[len];
-	System.arraycopy(_docstream,pos,contents,0,len);
+	System.arraycopy(docstream,pos,contents,0,len);
 	DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
 	EscherRecord record = erf.createRecord(contents,0);
 
@@ -285,22 +224,21 @@ public void walkTree(int depth, int startPos, int maxLen) {
 	// This (should) include the 8 byte header size
 	int recordLen = record.getRecordSize();
 
-
-	System.out.println(ind + "At position " + pos + " (" + makeHex(pos) + "):");
-	System.out.println(ind + "Type is " + atomType + " (" + makeHex((int)atomType) + "), len is " + atomLen + " (" + makeHex((int)atomLen) + ") (" + (atomLen+8) + ") - record claims " + recordLen);
-
+    String fmt = ind+"At position %2$d (%2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x) (%5$d) - record claims %6$d";
+    out.println(String.format(Locale.ROOT, fmt, "", pos, atomType, atomLen, atomLen+8, recordLen));
+	
+	
 	// Check for corrupt / lying ones
 	if(recordLen != 8 && (recordLen != (atomLen+8))) {
-		System.out.println(ind + "** Atom length of " + atomLen + " (" + (atomLen+8) + ") doesn't match record length of " + recordLen);
+		out.println(String.format(Locale.ROOT, ind+"** Atom length of $2d ($3d) doesn't match record length of %4d", "", atomLen, atomLen+8, recordLen));
 	}
 
 	// Print the record's details
-	if(record instanceof EscherContainerRecord) {
-		EscherContainerRecord ecr = (EscherContainerRecord)record;
-		System.out.println(ind + ecr.toString());
+    String recordStr = record.toString().replace("\n", String.format(Locale.ROOT,  "\n"+ind, ""));
+    out.println(String.format(Locale.ROOT, ind+"%2$s", "", recordStr));
+
+    if(record instanceof EscherContainerRecord) {
 		walkEscherDDF((indent+3), pos + 8, (int)atomLen );
-	} else {
-		System.out.println(ind + record.toString());
 	}
 
 	// Handle records that seem to lie
@@ -313,7 +251,7 @@ public void walkTree(int depth, int startPos, int maxLen) {
 		recordLen = (int)atomLen + 8;
 		record.fillFields( contents, 0, erf );
 		if(! (record instanceof EscherTextboxRecord)) {
-			System.out.println(ind + "** Really a msofbtClientTextbox !");
+			out.println(String.format(Locale.ROOT, ind+"%2$s", "", "** Really a msofbtClientTextbox !"));
 		}
 	}
 
@@ -344,58 +282,31 @@ public void walkTree(int depth, int startPos, int maxLen) {
   /**
    * Use the basic record format groking code to walk the Escher records
    */
-  public void walkEscherBasic(int indent, int pos, int len) {
+  public void walkEscherBasic(int indent, int pos, int len) throws IOException {
 	if(len < 8) { return; }
 
-	String ind = "";
-	for(int i=0; i<indent; i++) { ind += " "; }
+	final String ind = (indent == 0) ? "%1$s" : "%1$"+indent+"s";
 
-	long type = LittleEndian.getUShort(_docstream,pos+2);
-	long atomlen = LittleEndian.getUInt(_docstream,pos+4);
-	String typeS = makeHex((int)type);
+	long type = LittleEndian.getUShort(docstream,pos+2);
+	long atomlen = LittleEndian.getUInt(docstream,pos+4);
 
-	System.out.println(ind + "At position " + pos + " (" + makeHex(pos) + "):");
-	System.out.println(ind + "Type is " + type + " (" + typeS + "), len is " + atomlen + " (" + makeHex((int)atomlen) + ")");
+	String fmt = ind+"At position %2$d ($2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x)";
+	out.println(String.format(Locale.ROOT, fmt, "", pos, type, atomlen));
 
 	String typeName = RecordTypes.recordName((int)type);
-	if(typeName != null) {
-		System.out.println(ind + "That's an Escher Record: " + typeName);
-	} else {
-		System.out.println(ind + "(Unknown Escher Record)");
-	}
-
-
-	// Code to print the first 8 bytes
-//	System.out.print(ind);
-//	for(int i=0; i<8; i++) {
-//		short bv = _docstream[i+pos];
-//		if(bv < 0) { bv += 256; }
-//		System.out.print(i + "=" + bv + " (" + makeHex(bv) + ")  ");
-//	}
-//	System.out.println("");
+	out.println(String.format(Locale.ROOT, ind+"%2$s", "That's an Escher Record: ", typeName));
 
 	// Record specific dumps
 	if(type == 61453l) {
 		// Text Box. Print out first 8 bytes of data, then 8 4 later
-		System.out.print(ind);
-		for(int i=8; i<16; i++) {
-			short bv = _docstream[i+pos];
-			if(bv < 0) { bv += 256; }
-			System.out.print(i + "=" + bv + " (" + makeHex(bv) + ")  ");
-		}
-		System.out.println("");
-		System.out.print(ind);
-		for(int i=20; i<28; i++) {
-			short bv = _docstream[i+pos];
-			if(bv < 0) { bv += 256; }
-			System.out.print(i + "=" + bv + " (" + makeHex(bv) + ")  ");
-		}
-		System.out.println("");
+	    HexDump.dump(docstream, 0, out, pos+8, 8);
+	    HexDump.dump(docstream, 0, out, pos+20, 8);
+		out.println();
 	}
 
 
 	// Blank line before next entry
-	System.out.println("");
+	out.println();
 
 	// Look in children if we are a container
 	if(type == 61443l || type == 61444l) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
index 37d2092bf0..0babb76ae2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
@@ -233,14 +233,21 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
                 }
             }
 
-            for (int i = 0; i < _slides.size(); i++) {
-				HSLFSlide slide = _slides.get(i);
-
-				// Slide header, if set
-				HeadersFooters hf = slide.getHeadersFooters();
-				if (hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) {
-					ret.append(hf.getHeaderText() + "\n");
-				}
+            for (HSLFSlide slide : _slides) {
+                String headerText = "";
+                String footerText = "";
+                HeadersFooters hf = slide.getHeadersFooters();
+                if (hf != null) {
+                    if (hf.isHeaderVisible()) {
+                        headerText = safeLine(hf.getHeaderText());
+                    }
+                    if (hf.isFooterVisible()) {
+                        footerText = safeLine(hf.getFooterText());
+                    }
+                }
+                
+                // Slide header, if set
+				ret.append(headerText);
 
 				// Slide text
                 textRunsToText(ret, slide.getTextParagraphs());
@@ -252,9 +259,7 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
                     }
                 }
                 // Slide footer, if set
-				if (hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
-					ret.append(hf.getFooterText() + "\n");
-				}
+                ret.append(footerText);
 
 				// Comments, if requested and present
 				if (getCommentText) {
@@ -274,7 +279,18 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
 			// master sheets in. Grab Slide list, then work from there,
 			// but ensure no duplicates
 			HashSet<Integer> seenNotes = new HashSet<Integer>();
+            String headerText = "";
+            String footerText = "";
 			HeadersFooters hf = _show.getNotesHeadersFooters();
+			if (hf != null) {
+			    if (hf.isHeaderVisible()) {
+			        headerText = safeLine(hf.getHeaderText());
+			    }
+			    if (hf.isFooterVisible()) {
+                    footerText = safeLine(hf.getFooterText());
+			    }
+			}
+			
 
 			for (int i = 0; i < _slides.size(); i++) {
 				HSLFNotes notes = _slides.get(i).getNotes();
@@ -288,22 +304,22 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
 				seenNotes.add(id);
 
 				// Repeat the Notes header, if set
-				if (hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) {
-					ret.append(hf.getHeaderText() + "\n");
-				}
+			    ret.append(headerText);
 
 				// Notes text
                 textRunsToText(ret, notes.getTextParagraphs());
 
 				// Repeat the notes footer, if set
-				if (hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
-					ret.append(hf.getFooterText() + "\n");
-				}
+                ret.append(footerText);
 			}
 		}
 
 		return ret.toString();
 	}
+	
+	private static String safeLine(String text) {
+	    return (text == null) ? "" : (text+'\n');
+	}
 
     private void extractTableText(StringBuffer ret, HSLFTable table) {
         for (int row = 0; row < table.getNumberOfRows(); row++){
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java b/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
index a306058341..73a95f6d9a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
@@ -220,8 +220,7 @@ public final class RecordTypes {
      */
     public static String recordName(int type) {
         String name = typeToName.get(Integer.valueOf(type));
-        if (name == null) name = "Unknown" + type;
-        return name;
+        return (name == null) ? ("Unknown" + type) : name;
     }
 
     /**
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
index df1922e0c0..3cce5eebc1 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
@@ -189,13 +189,14 @@ public class ExcelToFoConverter extends AbstractExcelConverter
      * @return <tt>false</tt> if cell style by itself (without text, i.e.
      *         borders, fill, etc.) worth a mention, <tt>true</tt> otherwise
      */
-    protected boolean isEmptyStyle( CellStyle cellStyle )
-    {
-        return cellStyle.getFillPattern() == 0 //
-                && cellStyle.getBorderTop() == HSSFCellStyle.BORDER_NONE //
-                && cellStyle.getBorderRight() == HSSFCellStyle.BORDER_NONE //
-                && cellStyle.getBorderBottom() == HSSFCellStyle.BORDER_NONE //
-                && cellStyle.getBorderLeft() == HSSFCellStyle.BORDER_NONE; //
+    protected boolean isEmptyStyle( CellStyle cellStyle ) {
+        return cellStyle == null || (
+               cellStyle.getFillPattern() == 0
+            && cellStyle.getBorderTop() == HSSFCellStyle.BORDER_NONE
+            && cellStyle.getBorderRight() == HSSFCellStyle.BORDER_NONE
+            && cellStyle.getBorderBottom() == HSSFCellStyle.BORDER_NONE
+            && cellStyle.getBorderLeft() == HSSFCellStyle.BORDER_NONE
+        );
     }
 
     protected boolean processCell( HSSFWorkbook workbook, HSSFCell cell,
@@ -226,20 +227,17 @@ public class ExcelToFoConverter extends AbstractExcelConverter
                 }
                 break;
             case HSSFCell.CELL_TYPE_NUMERIC:
-                HSSFCellStyle style = cellStyle;
-                if ( style == null )
-                {
-                    value = String.valueOf( cell.getNumericCellValue() );
-                }
-                else
-                {
-                    value = ( _formatter.formatRawCellContents(
-                            cell.getNumericCellValue(), style.getDataFormat(),
-                            style.getDataFormatString() ) );
+                double nValue = cell.getNumericCellValue();
+                if ( cellStyle == null ) {
+                    value = Double.toString( nValue );
+                } else {
+                    short df = cellStyle.getDataFormat();
+                    String dfs = cellStyle.getDataFormatString();
+                    value = _formatter.formatRawCellContents(nValue, df, dfs );
                 }
                 break;
             case HSSFCell.CELL_TYPE_BOOLEAN:
-                value = String.valueOf( cell.getBooleanCellValue() );
+                value = Boolean.toString( cell.getBooleanCellValue() );
                 break;
             case HSSFCell.CELL_TYPE_ERROR:
                 value = ErrorEval.getText( cell.getErrorCellValue() );
@@ -260,7 +258,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter
             value = _formatter.formatCellValue( cell );
             break;
         case HSSFCell.CELL_TYPE_BOOLEAN:
-            value = String.valueOf( cell.getBooleanCellValue() );
+            value = Boolean.toString( cell.getBooleanCellValue() );
             break;
         case HSSFCell.CELL_TYPE_ERROR:
             value = ErrorEval.getText( cell.getErrorCellValue() );
@@ -272,20 +270,16 @@ public class ExcelToFoConverter extends AbstractExcelConverter
         }
 
         final boolean noText = ExcelToHtmlUtils.isEmpty( value );
-        final boolean wrapInDivs = !noText && !cellStyle.getWrapText();
+        final boolean wrapInDivs = !noText && (cellStyle == null || !cellStyle.getWrapText());
 
         final boolean emptyStyle = isEmptyStyle( cellStyle );
-        if ( !emptyStyle )
-        {
-            if ( noText )
-            {
-                /*
-                 * if cell style is defined (like borders, etc.) but cell text
-                 * is empty, add "&nbsp;" to output, so browser won't collapse
-                 * and ignore cell
-                 */
-                value = "\u00A0";
-            }
+        if ( !emptyStyle && noText ) {
+            /*
+             * if cell style is defined (like borders, etc.) but cell text
+             * is empty, add "&nbsp;" to output, so browser won't collapse
+             * and ignore cell
+             */
+            value = "\u00A0";
         }
 
         if ( isOutputLeadingSpacesAsNonBreaking() && value.startsWith( " " ) )
@@ -293,13 +287,15 @@ public class ExcelToFoConverter extends AbstractExcelConverter
             StringBuilder builder = new StringBuilder();
             for ( int c = 0; c < value.length(); c++ )
             {
-                if ( value.charAt( c ) != ' ' )
+                if ( value.charAt( c ) != ' ' ) {
                     break;
+                }
                 builder.append( '\u00a0' );
             }
 
-            if ( value.length() != builder.length() )
+            if ( value.length() != builder.length() ) {
                 builder.append( value.substring( builder.length() ) );
+            }
 
             value = builder.toString();
         }
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
index 78eb082a27..1805b15665 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
@@ -155,25 +155,21 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
         style.append( "white-space:pre-wrap;" );
         ExcelToHtmlUtils.appendAlign( style, cellStyle.getAlignment() );
 
-        if ( cellStyle.getFillPattern() == 0 )
-        {
+        switch (cellStyle.getFillPattern()) {
             // no fill
-        }
-        else if ( cellStyle.getFillPattern() == 1 )
-        {
-            final HSSFColor foregroundColor = cellStyle
-                    .getFillForegroundColorColor();
-            if ( foregroundColor != null )
-                style.append( "background-color:"
-                        + ExcelToHtmlUtils.getColor( foregroundColor ) + ";" );
-        }
-        else
-        {
-            final HSSFColor backgroundColor = cellStyle
-                    .getFillBackgroundColorColor();
-            if ( backgroundColor != null )
-                style.append( "background-color:"
-                        + ExcelToHtmlUtils.getColor( backgroundColor ) + ";" );
+            case 0: break;
+            case 1:
+                final HSSFColor foregroundColor = cellStyle.getFillForegroundColorColor();
+                if ( foregroundColor == null ) break;
+                String fgCol = ExcelToHtmlUtils.getColor( foregroundColor );
+                style.append( "background-color:" + fgCol + ";" );
+                break;
+            default:
+                final HSSFColor backgroundColor = cellStyle.getFillBackgroundColorColor();
+                if ( backgroundColor == null ) break;
+                String bgCol = ExcelToHtmlUtils.getColor( backgroundColor );
+                style.append( "background-color:" + bgCol + ";" );
+                break;
         }
 
         buildStyle_border( workbook, style, "top", cellStyle.getBorderTop(),
@@ -194,8 +190,9 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
     private void buildStyle_border( HSSFWorkbook workbook, StringBuilder style,
             String type, short xlsBorder, short borderColor )
     {
-        if ( xlsBorder == HSSFCellStyle.BORDER_NONE )
+        if ( xlsBorder == HSSFCellStyle.BORDER_NONE ) {
             return;
+        }
 
         StringBuilder borderStyle = new StringBuilder();
         borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) );
@@ -315,16 +312,13 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
                 }
                 break;
             case HSSFCell.CELL_TYPE_NUMERIC:
-                HSSFCellStyle style = cellStyle;
-                if ( style == null )
-                {
-                    value = String.valueOf( cell.getNumericCellValue() );
-                }
-                else
-                {
-                    value = ( _formatter.formatRawCellContents(
-                            cell.getNumericCellValue(), style.getDataFormat(),
-                            style.getDataFormatString() ) );
+                double nValue = cell.getNumericCellValue();
+                if ( cellStyle == null ) {
+                    value = Double.toString(nValue);
+                } else {
+                    short df = cellStyle.getDataFormat();
+                    String dfs = cellStyle.getDataFormatString();
+                    value = _formatter.formatRawCellContents(nValue, df, dfs);
                 }
                 break;
             case HSSFCell.CELL_TYPE_BOOLEAN:
@@ -362,27 +356,22 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
 
         final boolean noText = ExcelToHtmlUtils.isEmpty( value );
         final boolean wrapInDivs = !noText && isUseDivsToSpan()
-                && !cellStyle.getWrapText();
+                && (cellStyle == null || !cellStyle.getWrapText());
 
-        final short cellStyleIndex = cellStyle.getIndex();
-        if ( cellStyleIndex != 0 )
+        if ( cellStyle != null && cellStyle.getIndex() != 0 )
         {
             @SuppressWarnings("resource")
             HSSFWorkbook workbook = cell.getRow().getSheet().getWorkbook();
             String mainCssClass = getStyleClassName( workbook, cellStyle );
             
-            if ( wrapInDivs )
-            {
+            if ( wrapInDivs ) {
                 tableCellElement.setAttribute( "class", mainCssClass + " "
                         + cssClassContainerCell );
-            }
-            else
-            {
+            } else {
                 tableCellElement.setAttribute( "class", mainCssClass );
             }
 
-            if ( noText )
-            {
+            if ( noText ) {
                 /*
                  * if cell style is defined (like borders, etc.) but cell text
                  * is empty, add "&nbsp;" to output, so browser won't collapse
@@ -429,8 +418,9 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
             innerDivStyle.append( "overflow:hidden;max-height:" );
             innerDivStyle.append( normalHeightPt );
             innerDivStyle.append( "pt;white-space:nowrap;" );
-            ExcelToHtmlUtils.appendAlign( innerDivStyle,
-                    cellStyle.getAlignment() );
+            if (cellStyle != null) {
+                ExcelToHtmlUtils.appendAlign( innerDivStyle, cellStyle.getAlignment() );
+            }
             htmlDocumentFacade.addStyleClass( outerDiv, cssClassPrefixDiv,
                     innerDivStyle.toString() );
 
@@ -443,7 +433,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
             tableCellElement.appendChild( text );
         }
 
-        return ExcelToHtmlUtils.isEmpty( value ) && cellStyleIndex == 0;
+        return ExcelToHtmlUtils.isEmpty( value ) && (cellStyle == null || cellStyle.getIndex() == 0);
     }
 
     protected void processColumnHeaders( HSSFSheet sheet, int maxSheetColumns,
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
index 9c5de67924..773f731d47 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.model.types;
 
 import java.util.Arrays;
 
-import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
@@ -33,61 +32,61 @@ import org.apache.poi.util.LittleEndian;
  * @author S. Ryan Ackley
  */
 @Internal
-public abstract class DOPAbstractType implements HDFType {
+public abstract class DOPAbstractType {
 
     protected byte field_1_formatFlags;
-    /**/private static BitField fFacingPages = new BitField(0x01);
-    /**/private static BitField fWidowControl = new BitField(0x02);
-    /**/private static BitField fPMHMainDoc = new BitField(0x04);
-    /**/private static BitField grfSupression = new BitField(0x18);
-    /**/private static BitField fpc = new BitField(0x60);
-    /**/private static BitField unused1 = new BitField(0x80);
+    private static final BitField fFacingPages = new BitField(0x01);
+    private static final BitField fWidowControl = new BitField(0x02);
+    private static final BitField fPMHMainDoc = new BitField(0x04);
+    private static final BitField grfSupression = new BitField(0x18);
+    private static final BitField fpc = new BitField(0x60);
+    private static final BitField unused1 = new BitField(0x80);
     protected byte field_2_unused2;
     protected short field_3_footnoteInfo;
-    /**/private static BitField rncFtn = new BitField(0x0003);
-    /**/private static BitField nFtn = new BitField(0xfffc);
+    private static final BitField rncFtn = new BitField(0x0003);
+    private static final BitField nFtn = new BitField(0xfffc);
     protected byte field_4_fOutlineDirtySave;
     protected byte field_5_docinfo;
-    /**/private static BitField fOnlyMacPics = new BitField(0x01);
-    /**/private static BitField fOnlyWinPics = new BitField(0x02);
-    /**/private static BitField fLabelDoc = new BitField(0x04);
-    /**/private static BitField fHyphCapitals = new BitField(0x08);
-    /**/private static BitField fAutoHyphen = new BitField(0x10);
-    /**/private static BitField fFormNoFields = new BitField(0x20);
-    /**/private static BitField fLinkStyles = new BitField(0x40);
-    /**/private static BitField fRevMarking = new BitField(0x80);
+    private static final BitField fOnlyMacPics = new BitField(0x01);
+    private static final BitField fOnlyWinPics = new BitField(0x02);
+    private static final BitField fLabelDoc = new BitField(0x04);
+    private static final BitField fHyphCapitals = new BitField(0x08);
+    private static final BitField fAutoHyphen = new BitField(0x10);
+    private static final BitField fFormNoFields = new BitField(0x20);
+    private static final BitField fLinkStyles = new BitField(0x40);
+    private static final BitField fRevMarking = new BitField(0x80);
     protected byte field_6_docinfo1;
-    /**/private static BitField fBackup = new BitField(0x01);
-    /**/private static BitField fExactCWords = new BitField(0x02);
-    /**/private static BitField fPagHidden = new BitField(0x04);
-    /**/private static BitField fPagResults = new BitField(0x08);
-    /**/private static BitField fLockAtn = new BitField(0x10);
-    /**/private static BitField fMirrorMargins = new BitField(0x20);
-    /**/private static BitField unused3 = new BitField(0x40);
-    /**/private static BitField fDfltTrueType = new BitField(0x80);
+    private static final BitField fBackup = new BitField(0x01);
+    private static final BitField fExactCWords = new BitField(0x02);
+    private static final BitField fPagHidden = new BitField(0x04);
+    private static final BitField fPagResults = new BitField(0x08);
+    private static final BitField fLockAtn = new BitField(0x10);
+    private static final BitField fMirrorMargins = new BitField(0x20);
+    private static final BitField unused3 = new BitField(0x40);
+    private static final BitField fDfltTrueType = new BitField(0x80);
     protected byte field_7_docinfo2;
-    /**/private static BitField fPagSupressTopSpacing = new BitField(0x01);
-    /**/private static BitField fProtEnabled = new BitField(0x02);
-    /**/private static BitField fDispFormFldSel = new BitField(0x04);
-    /**/private static BitField fRMView = new BitField(0x08);
-    /**/private static BitField fRMPrint = new BitField(0x10);
-    /**/private static BitField unused4 = new BitField(0x20);
-    /**/private static BitField fLockRev = new BitField(0x40);
-    /**/private static BitField fEmbedFonts = new BitField(0x80);
+    private static final BitField fPagSupressTopSpacing = new BitField(0x01);
+    private static final BitField fProtEnabled = new BitField(0x02);
+    private static final BitField fDispFormFldSel = new BitField(0x04);
+    private static final BitField fRMView = new BitField(0x08);
+    private static final BitField fRMPrint = new BitField(0x10);
+    private static final BitField unused4 = new BitField(0x20);
+    private static final BitField fLockRev = new BitField(0x40);
+    private static final BitField fEmbedFonts = new BitField(0x80);
     protected short field_8_docinfo3;
-    /**/private static BitField oldfNoTabForInd = new BitField(0x0001);
-    /**/private static BitField oldfNoSpaceRaiseLower = new BitField(0x0002);
-    /**/private static BitField oldfSuppressSpbfAfterPageBreak = new BitField(0x0004);
-    /**/private static BitField oldfWrapTrailSpaces = new BitField(0x0008);
-    /**/private static BitField oldfMapPrintTextColor = new BitField(0x0010);
-    /**/private static BitField oldfNoColumnBalance = new BitField(0x0020);
-    /**/private static BitField oldfConvMailMergeEsc = new BitField(0x0040);
-    /**/private static BitField oldfSupressTopSpacing = new BitField(0x0080);
-    /**/private static BitField oldfOrigWordTableRules = new BitField(0x0100);
-    /**/private static BitField oldfTransparentMetafiles = new BitField(0x0200);
-    /**/private static BitField oldfShowBreaksInFrames = new BitField(0x0400);
-    /**/private static BitField oldfSwapBordersFacingPgs = new BitField(0x0800);
-    /**/private static BitField unused5 = new BitField(0xf000);
+    private static final BitField oldfNoTabForInd = new BitField(0x0001);
+    private static final BitField oldfNoSpaceRaiseLower = new BitField(0x0002);
+    private static final BitField oldfSuppressSpbfAfterPageBreak = new BitField(0x0004);
+    private static final BitField oldfWrapTrailSpaces = new BitField(0x0008);
+    private static final BitField oldfMapPrintTextColor = new BitField(0x0010);
+    private static final BitField oldfNoColumnBalance = new BitField(0x0020);
+    private static final BitField oldfConvMailMergeEsc = new BitField(0x0040);
+    private static final BitField oldfSupressTopSpacing = new BitField(0x0080);
+    private static final BitField oldfOrigWordTableRules = new BitField(0x0100);
+    private static final BitField oldfTransparentMetafiles = new BitField(0x0200);
+    private static final BitField oldfShowBreaksInFrames = new BitField(0x0400);
+    private static final BitField oldfSwapBordersFacingPgs = new BitField(0x0800);
+    private static final BitField unused5 = new BitField(0xf000);
     protected int field_9_dxaTab;
     protected int field_10_wSpare;
     protected int field_11_dxaHotz;
@@ -103,16 +102,16 @@ public abstract class DOPAbstractType implements HDFType {
     protected int field_21_cPg;
     protected int field_22_cParas;
     protected short field_23_Edn;
-    /**/private static BitField rncEdn = new BitField(0x0003);
-    /**/private static BitField nEdn = new BitField(0xfffc);
+    private static final BitField rncEdn = new BitField(0x0003);
+    private static final BitField nEdn = new BitField(0xfffc);
     protected short field_24_Edn1;
-    /**/private static BitField epc = new BitField(0x0003);
-    /**/private static BitField nfcFtnRef1 = new BitField(0x003c);
-    /**/private static BitField nfcEdnRef1 = new BitField(0x03c0);
-    /**/private static BitField fPrintFormData = new BitField(0x0400);
-    /**/private static BitField fSaveFormData = new BitField(0x0800);
-    /**/private static BitField fShadeFormData = new BitField(0x1000);
-    /**/private static BitField fWCFtnEdn = new BitField(0x8000);
+    private static final BitField epc = new BitField(0x0003);
+    private static final BitField nfcFtnRef1 = new BitField(0x003c);
+    private static final BitField nfcEdnRef1 = new BitField(0x03c0);
+    private static final BitField fPrintFormData = new BitField(0x0400);
+    private static final BitField fSaveFormData = new BitField(0x0800);
+    private static final BitField fShadeFormData = new BitField(0x1000);
+    private static final BitField fWCFtnEdn = new BitField(0x8000);
     protected int field_25_cLines;
     protected int field_26_cWordsFtnEnd;
     protected int field_27_cChFtnEdn;
@@ -121,55 +120,55 @@ public abstract class DOPAbstractType implements HDFType {
     protected int field_30_cLinesFtnEdn;
     protected int field_31_lKeyProtDoc;
     protected short field_32_view;
-    /**/private static BitField wvkSaved = new BitField(0x0007);
-    /**/private static BitField wScaleSaved = new BitField(0x0ff8);
-    /**/private static BitField zkSaved = new BitField(0x3000);
-    /**/private static BitField fRotateFontW6 = new BitField(0x4000);
-    /**/private static BitField iGutterPos = new BitField(0x8000);
+    private static final BitField wvkSaved = new BitField(0x0007);
+    private static final BitField wScaleSaved = new BitField(0x0ff8);
+    private static final BitField zkSaved = new BitField(0x3000);
+    private static final BitField fRotateFontW6 = new BitField(0x4000);
+    private static final BitField iGutterPos = new BitField(0x8000);
     protected int field_33_docinfo4;
-    /**/private static BitField fNoTabForInd = new BitField(0x00000001);
-    /**/private static BitField fNoSpaceRaiseLower = new BitField(0x00000002);
-    /**/private static BitField fSupressSpdfAfterPageBreak = new BitField(0x00000004);
-    /**/private static BitField fWrapTrailSpaces = new BitField(0x00000008);
-    /**/private static BitField fMapPrintTextColor = new BitField(0x00000010);
-    /**/private static BitField fNoColumnBalance = new BitField(0x00000020);
-    /**/private static BitField fConvMailMergeEsc = new BitField(0x00000040);
-    /**/private static BitField fSupressTopSpacing = new BitField(0x00000080);
-    /**/private static BitField fOrigWordTableRules = new BitField(0x00000100);
-    /**/private static BitField fTransparentMetafiles = new BitField(0x00000200);
-    /**/private static BitField fShowBreaksInFrames = new BitField(0x00000400);
-    /**/private static BitField fSwapBordersFacingPgs = new BitField(0x00000800);
-    /**/private static BitField fSuppressTopSPacingMac5 = new BitField(0x00010000);
-    /**/private static BitField fTruncDxaExpand = new BitField(0x00020000);
-    /**/private static BitField fPrintBodyBeforeHdr = new BitField(0x00040000);
-    /**/private static BitField fNoLeading = new BitField(0x00080000);
-    /**/private static BitField fMWSmallCaps = new BitField(0x00200000);
+    private static final BitField fNoTabForInd = new BitField(0x00000001);
+    private static final BitField fNoSpaceRaiseLower = new BitField(0x00000002);
+    private static final BitField fSupressSpdfAfterPageBreak = new BitField(0x00000004);
+    private static final BitField fWrapTrailSpaces = new BitField(0x00000008);
+    private static final BitField fMapPrintTextColor = new BitField(0x00000010);
+    private static final BitField fNoColumnBalance = new BitField(0x00000020);
+    private static final BitField fConvMailMergeEsc = new BitField(0x00000040);
+    private static final BitField fSupressTopSpacing = new BitField(0x00000080);
+    private static final BitField fOrigWordTableRules = new BitField(0x00000100);
+    private static final BitField fTransparentMetafiles = new BitField(0x00000200);
+    private static final BitField fShowBreaksInFrames = new BitField(0x00000400);
+    private static final BitField fSwapBordersFacingPgs = new BitField(0x00000800);
+    private static final BitField fSuppressTopSPacingMac5 = new BitField(0x00010000);
+    private static final BitField fTruncDxaExpand = new BitField(0x00020000);
+    private static final BitField fPrintBodyBeforeHdr = new BitField(0x00040000);
+    private static final BitField fNoLeading = new BitField(0x00080000);
+    private static final BitField fMWSmallCaps = new BitField(0x00200000);
     protected short field_34_adt;
     protected byte[] field_35_doptypography;
     protected byte[] field_36_dogrid;
     protected short field_37_docinfo5;
-    /**/private static BitField lvl = new BitField(0x001e);
-    /**/private static BitField fGramAllDone = new BitField(0x0020);
-    /**/private static BitField fGramAllClean = new BitField(0x0040);
-    /**/private static BitField fSubsetFonts = new BitField(0x0080);
-    /**/private static BitField fHideLastVersion = new BitField(0x0100);
-    /**/private static BitField fHtmlDoc = new BitField(0x0200);
-    /**/private static BitField fSnapBorder = new BitField(0x0800);
-    /**/private static BitField fIncludeHeader = new BitField(0x1000);
-    /**/private static BitField fIncludeFooter = new BitField(0x2000);
-    /**/private static BitField fForcePageSizePag = new BitField(0x4000);
-    /**/private static BitField fMinFontSizePag = new BitField(0x8000);
+    private static final BitField lvl = new BitField(0x001e);
+    private static final BitField fGramAllDone = new BitField(0x0020);
+    private static final BitField fGramAllClean = new BitField(0x0040);
+    private static final BitField fSubsetFonts = new BitField(0x0080);
+    private static final BitField fHideLastVersion = new BitField(0x0100);
+    private static final BitField fHtmlDoc = new BitField(0x0200);
+    private static final BitField fSnapBorder = new BitField(0x0800);
+    private static final BitField fIncludeHeader = new BitField(0x1000);
+    private static final BitField fIncludeFooter = new BitField(0x2000);
+    private static final BitField fForcePageSizePag = new BitField(0x4000);
+    private static final BitField fMinFontSizePag = new BitField(0x8000);
     protected short field_38_docinfo6;
-    /**/private static BitField fHaveVersions = new BitField(0x0001);
-    /**/private static BitField fAutoVersions = new BitField(0x0002);
+    private static final BitField fHaveVersions = new BitField(0x0001);
+    private static final BitField fAutoVersions = new BitField(0x0002);
     protected byte[] field_39_asumyi;
     protected int field_40_cChWS;
     protected int field_41_cChWSFtnEdn;
     protected int field_42_grfDocEvents;
     protected int field_43_virusinfo;
-    /**/private static BitField fVirusPrompted = new BitField(0x0001);
-    /**/private static BitField fVirusLoadSafe = new BitField(0x0002);
-    /**/private static BitField KeyVirusSession30 = new BitField(0xfffffffc);
+    private static final BitField fVirusPrompted = new BitField(0x0001);
+    private static final BitField fVirusLoadSafe = new BitField(0x0002);
+    private static final BitField KeyVirusSession30 = new BitField(0xfffffffc);
     protected byte[] field_44_Spare;
     protected int field_45_reserved1;
     protected int field_46_reserved2;
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 a56e673f66..04adf1a429 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
@@ -17,7 +17,6 @@
 
 package org.apache.poi.hwpf.model.types;
 
-import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.Internal;
 
@@ -34,21 +33,21 @@ import org.apache.poi.util.Internal;
  *         File Format Specification [*.doc]
  */
 @Internal
-public abstract class FLDAbstractType implements HDFType
+public abstract class FLDAbstractType
 {
 
     protected byte field_1_chHolder;
-    private static BitField ch = new BitField( 0x1f );
-    private static BitField reserved = new BitField( 0xe0 );
+    private static final BitField ch = new BitField( 0x1f );
+    private static final BitField reserved = new BitField( 0xe0 );
     protected byte field_2_flt;
-    private static BitField fDiffer = new BitField( 0x01 );
-    private static BitField fZombieEmbed = new BitField( 0x02 );
-    private static BitField fResultDirty = new BitField( 0x04 );
-    private static BitField fResultEdited = new BitField( 0x08 );
-    private static BitField fLocked = new BitField( 0x10 );
-    private static BitField fPrivateResult = new BitField( 0x20 );
-    private static BitField fNested = new BitField( 0x40 );
-    private static BitField fHasSep = new BitField( 0x40 );
+    private static final BitField fDiffer = new BitField( 0x01 );
+    private static final BitField fZombieEmbed = new BitField( 0x02 );
+    private static final BitField fResultDirty = new BitField( 0x04 );
+    private static final BitField fResultEdited = new BitField( 0x08 );
+    private static final BitField fLocked = new BitField( 0x10 );
+    private static final BitField fPrivateResult = new BitField( 0x20 );
+    private static final BitField fNested = new BitField( 0x40 );
+    private static final BitField fHasSep = new BitField( 0x40 );
 
     public FLDAbstractType()
     {
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
index 067727ba04..58fab86528 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
@@ -17,7 +17,6 @@
 

 package org.apache.poi.hwpf.model.types;

 

-import org.apache.poi.hdf.model.hdftypes.HDFType;

 import org.apache.poi.util.BitField;

 import org.apache.poi.util.Internal;

 import org.apache.poi.util.LittleEndian;

@@ -35,18 +34,18 @@ import org.apache.poi.util.LittleEndian;
  *         File Format Specification [*.doc]

  */

 @Internal

-public abstract class TLPAbstractType implements HDFType

+public abstract class TLPAbstractType

 {

 

     protected short field_1_itl;

     protected byte field_2_tlp_flags;

-    private static BitField fBorders = new BitField( 0x0001 );

-    private static BitField fShading = new BitField( 0x0002 );

-    private static BitField fFont = new BitField( 0x0004 );

-    private static BitField fColor = new BitField( 0x0008 );

-    private static BitField fBestFit = new BitField( 0x0010 );

-    private static BitField fHdrRows = new BitField( 0x0020 );

-    private static BitField fLastRow = new BitField( 0x0040 );

+    private static final BitField fBorders = new BitField( 0x0001 );

+    private static final BitField fShading = new BitField( 0x0002 );

+    private static final BitField fFont = new BitField( 0x0004 );

+    private static final BitField fColor = new BitField( 0x0008 );

+    private static final BitField fBestFit = new BitField( 0x0010 );

+    private static final BitField fHdrRows = new BitField( 0x0020 );

+    private static final BitField fLastRow = new BitField( 0x0040 );

 

     public TLPAbstractType()

     {

diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/extractor/TestWordDocument.java b/src/scratchpad/testcases/org/apache/poi/hdf/extractor/TestWordDocument.java
deleted file mode 100644
index e8c04a331c..0000000000
--- a/src/scratchpad/testcases/org/apache/poi/hdf/extractor/TestWordDocument.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   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.hdf.extractor;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.junit.Test;
-
-
-public class TestWordDocument {
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testMain() {
-        // fails, but exception is caught and only printed
-        //WordDocument.main(new String[] {});
-        
-        //WordDocument.main(new String[] {"test-data/document/Word95.doc", "/tmp/test.doc"});
-        //WordDocument.main(new String[] {"test-data/document/Word6.doc", "/tmp/test.doc"});
-        WordDocument.main(new String[] {POIDataSamples.getDocumentInstance().getFile("53446.doc").getAbsolutePath(), "/tmp/test.doc"});
-    }
-
-    @SuppressWarnings("deprecation")
-	@Test
-    public void test47304() throws IOException {
-    	HWPFDocument doc = HWPFTestDataSamples.openSampleFile("47304.doc");
-    	assertNotNull(doc);
-    	
-    	WordExtractor extractor = new WordExtractor(doc);
-        String text = extractor.getText();
-        //System.out.println(text);
-        assertTrue("Had: " + text, text.contains("Just  a \u201Ctest\u201D"));
-        extractor.close();
-        
-		WordDocument wordDoc = new WordDocument(POIDataSamples.getDocumentInstance().getFile("47304.doc").getAbsolutePath());
-        
-        StringWriter docTextWriter = new StringWriter();
-        PrintWriter out = new PrintWriter(docTextWriter);
-        try {
-        	wordDoc.writeAllText(out);
-        } finally {
-        	out.close();
-        }
-        docTextWriter.close();
-
-        //System.out.println(docTextWriter.toString());
-        assertTrue("Had: " + docTextWriter.toString(), docTextWriter.toString().contains("Just  a \u201Ctest\u201D"));
-    }
-}
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java b/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
deleted file mode 100644
index 6ccde8743d..0000000000
--- a/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   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.hdf.model;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Class to test {@link HDFDocument} functionality
- *
- * @author Bob Otterberg
- */
-public final class TestHDFDocument extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getDocumentInstance();
-
-    /**
-     * OBJECTIVE:  Test that HDF can read an empty document (empty.doc).<P>
-     * SUCCESS:    HDF reads the document.  Matches values in their particular positions.<P>
-     * FAILURE:    HDF does not read the document or excepts.  HDF cannot identify values
-     *             in the document in their known positions.<P>
-     */
-    public void testEmpty() throws IOException {
-        InputStream stream = _samples.openResourceAsStream("empty.doc");
-        new HDFDocument(stream);
-    }
-
-    /**
-     * OBJECTIVE:  Test that HDF can read an _very_ simple document (simple.doc).<P>
-     * SUCCESS:    HDF reads the document.  Matches values in their particular positions.<P>
-     * FAILURE:    HDF does not read the document or excepts.  HDF cannot identify values
-     *             in the document in their known positions.<P>
-     */
-    public void testSimple() throws IOException {
-        InputStream stream = _samples.openResourceAsStream("simple.doc");
-        new HDFDocument(stream);
-    }
-
-    /**
-     * OBJECTIVE:  Test that HDF can read a document containing a simple list (simple-list.doc).<P>
-     * SUCCESS:    HDF reads the document.  Matches values in their particular positions.<P>
-     * FAILURE:    HDF does not read the document or excepts.  HDF cannot identify values
-     *             in the document in their known positions.<P>
-     *
-     */
-    public void testSimpleList() throws IOException {
-        InputStream stream = _samples.openResourceAsStream("simple-list.doc");
-        new HDFDocument(stream);
-    }
-
-    /**
-     * OBJECTIVE:  Test that HDF can read a document containing a simple table (simple-table.doc).<P>
-     * SUCCESS:    HDF reads the document.  Matches values in their particular positions.<P>
-     * FAILURE:    HDF does not read the document or excepts.  HDF cannot identify values
-     *             in the document in their known positions.<P>
-     */
-    public void testSimpleTable() throws IOException {
-        InputStream stream = _samples.openResourceAsStream("simple-table.doc");
-        new HDFDocument(stream);
-    }
-}