From 99f4a647f3f73fbf44b57dd5cc53a595e55740d1 Mon Sep 17 00:00:00 2001
From: No Author <dev-null@apache.org>
Date: Sat, 15 Jun 2002 03:21:07 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create tag
 'REL_1_5_BRANCH_MERGE5'.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/tags/REL_1_5_BRANCH_MERGE5@352700 13f79535-47bb-0310-9956-ffa450edef68
---
 module.xml                                    |    6 +-
 src/documentation/images/logoRaPiGmbH1.png    |  Bin 0 -> 5976 bytes
 src/documentation/images/logoRaPiGmbH2.png    |  Bin 0 -> 6001 bytes
 src/documentation/images/logoRaPiGmbH3.png    |  Bin 0 -> 3594 bytes
 src/documentation/images/logoRaPiGmbH4.png    |  Bin 0 -> 2658 bytes
 src/documentation/images/logoRaPiGmbH5.png    |  Bin 0 -> 7423 bytes
 src/documentation/images/logoRaPiGmbH6.png    |  Bin 0 -> 6640 bytes
 src/documentation/images/logoRaPiGmbH7.png    |  Bin 0 -> 9630 bytes
 src/documentation/xdocs/book.xml              |    1 +
 src/documentation/xdocs/branching.xml         |   97 ++
 src/documentation/xdocs/changes.xml           |    6 +-
 src/documentation/xdocs/historyandfuture.xml  |    2 +-
 src/documentation/xdocs/hssf/how-to.xml       |   49 +-
 src/documentation/xdocs/hssf/quick-guide.xml  |   30 +
 src/documentation/xdocs/news/logocontest.xml  |  239 ++--
 .../usermodel/examples/NewLinesInCells.java   |  100 ++
 .../org/apache/poi/hssf/dev/BiffViewer.java   |    8 +-
 .../org/apache/poi/hssf/model/Workbook.java   |   17 +-
 .../poi/hssf/record/ContinueRecord.java       |    7 +-
 .../poi/hssf/record/RecordProcessor.java      |  202 ++++
 .../org/apache/poi/hssf/record/RowRecord.java |    4 +-
 .../poi/hssf/record/SSTDeserializer.java      |  562 +++++++++
 .../org/apache/poi/hssf/record/SSTRecord.java |  899 ++------------
 .../apache/poi/hssf/record/SSTSerializer.java |  356 ++++++
 .../apache/poi/hssf/record/UnicodeString.java |   67 +-
 .../apache/poi/hssf/usermodel/HSSFRow.java    |   28 +-
 .../apache/poi/hssf/usermodel/HSSFSheet.java  |  159 ++-
 src/java/org/apache/poi/util/HexDump.java     |   40 +-
 src/java/org/apache/poi/util/HexRead.java     |  116 ++
 .../org/apache/poi/util/LittleEndian.java     |   29 +-
 .../org/apache/poi/util/POILogFactory.java    |   31 +-
 src/java/org/apache/poi/util/POILogger.java   |  127 +-
 .../org/apache/poi/hssf/data/BigSSTRecord     | 1032 ++++++++---------
 .../org/apache/poi/hssf/data/duprich1.xls     |  Bin 0 -> 21504 bytes
 .../org/apache/poi/hssf/data/duprich2.xls     |  Bin 0 -> 13824 bytes
 .../apache/poi/hssf/data/evencontinuation.txt |   16 +
 .../org/apache/poi/hssf/data/richtextdata.txt |   21 +
 .../hssf/data/stringacross2continuations.txt  |    7 +
 .../data/stringacross2continuationsCR1.txt    |    9 +
 .../data/stringacross2continuationsCR2.txt    |    7 +
 .../apache/poi/hssf/record/TestSSTRecord.java |  620 +++++-----
 .../poi/hssf/usermodel/TestHSSFRow.java       |   39 +-
 .../poi/hssf/usermodel/TestHSSFSheet.java     |   12 +-
 .../org/apache/poi/util/TestLittleEndian.java |    6 +
 .../apache/poi/util/TestPOILogFactory.java    |   47 +-
 .../org/apache/poi/util/TestPOILogger.java    |   51 +-
 46 files changed, 2945 insertions(+), 2104 deletions(-)
 create mode 100644 src/documentation/images/logoRaPiGmbH1.png
 create mode 100644 src/documentation/images/logoRaPiGmbH2.png
 create mode 100644 src/documentation/images/logoRaPiGmbH3.png
 create mode 100644 src/documentation/images/logoRaPiGmbH4.png
 create mode 100644 src/documentation/images/logoRaPiGmbH5.png
 create mode 100644 src/documentation/images/logoRaPiGmbH6.png
 create mode 100644 src/documentation/images/logoRaPiGmbH7.png
 create mode 100644 src/documentation/xdocs/branching.xml
 create mode 100644 src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java
 create mode 100644 src/java/org/apache/poi/hssf/record/RecordProcessor.java
 create mode 100644 src/java/org/apache/poi/hssf/record/SSTDeserializer.java
 create mode 100644 src/java/org/apache/poi/hssf/record/SSTSerializer.java
 create mode 100644 src/java/org/apache/poi/util/HexRead.java
 create mode 100644 src/testcases/org/apache/poi/hssf/data/duprich1.xls
 create mode 100644 src/testcases/org/apache/poi/hssf/data/duprich2.xls
 create mode 100644 src/testcases/org/apache/poi/hssf/data/evencontinuation.txt
 create mode 100644 src/testcases/org/apache/poi/hssf/data/richtextdata.txt
 create mode 100644 src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt
 create mode 100644 src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR1.txt
 create mode 100644 src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR2.txt

diff --git a/module.xml b/module.xml
index 93a451d2c..503da0f11 100644
--- a/module.xml
+++ b/module.xml
@@ -68,8 +68,8 @@
   
      <version major="1"
              minor="5"   
-             fix  ="0"   
-             tag="dev"/> 
+	     fix  ="1"   
+	     tag="final"/>
              
     <package>org.apache.poi</package>
 
@@ -87,7 +87,7 @@
     <depend project="junit"/>
     <depend project="IzPress"/>
     <!-- needed for POI -->
-    <depend project="commons-logging"/>
+    <!-- <depend project="commons-logging"/> -->
     
     <!-- Project jars POI build can use  -->    
     <option project="jakarta-log4j"/>
diff --git a/src/documentation/images/logoRaPiGmbH1.png b/src/documentation/images/logoRaPiGmbH1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bef8bb6e9583059dfe31df3f3b3a69fb3ba6354
GIT binary patch
literal 5976
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
CknTVL

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH2.png b/src/documentation/images/logoRaPiGmbH2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d842217557b9b3a3e18ff41459d9a76c41cf4d14
GIT binary patch
literal 6001
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

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH3.png b/src/documentation/images/logoRaPiGmbH3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0419155689825081d644f604925c10e61a98310e
GIT binary patch
literal 3594
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
QI{*Lx07*qoM6N<$f?TE37XSbN

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH4.png b/src/documentation/images/logoRaPiGmbH4.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8d44d6e49d3dc917088c4fe5d6c1c199f51915
GIT binary patch
literal 2658
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
Q7ytkO07*qoM6N<$f*b$_4gdfE

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH5.png b/src/documentation/images/logoRaPiGmbH5.png
new file mode 100644
index 0000000000000000000000000000000000000000..f96ef9ef910ef223a4813fff07701c8d8556f1d4
GIT binary patch
literal 7423
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

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH6.png b/src/documentation/images/logoRaPiGmbH6.png
new file mode 100644
index 0000000000000000000000000000000000000000..53ee5e9eab0d4d1bd576081d0eb2ee001e82e3cf
GIT binary patch
literal 6640
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

literal 0
HcmV?d00001

diff --git a/src/documentation/images/logoRaPiGmbH7.png b/src/documentation/images/logoRaPiGmbH7.png
new file mode 100644
index 0000000000000000000000000000000000000000..498499d9df153a7597bac098004a81a355ac5388
GIT binary patch
literal 9630
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
E1Lh8c1poj5

literal 0
HcmV?d00001

diff --git a/src/documentation/xdocs/book.xml b/src/documentation/xdocs/book.xml
index e5ab10098..1d4b945e3 100644
--- a/src/documentation/xdocs/book.xml
+++ b/src/documentation/xdocs/book.xml
@@ -39,6 +39,7 @@
 
   <menu label="Get Involved">
     <menu-item label="Contributing" href="contrib.html"/>
+    <menu-item label="Branching" href="branching.html"/>
     <menu-item label="Bug Database" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"/>
     <menu-item label="CVS" href="http://jakarta.apache.org/site/cvsindex.html"/>
     <menu-item label="Mail Lists" href="http://jakarta.apache.org/site/mail.html"/>
diff --git a/src/documentation/xdocs/branching.xml b/src/documentation/xdocs/branching.xml
new file mode 100644
index 000000000..4246d8344
--- /dev/null
+++ b/src/documentation/xdocs/branching.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
+
+<document>
+
+    <header>
+        <title>Branching</title>
+        <authors>
+            <person id="GJS" name="Glen Stampoultzis" email="glens@apache.org"/>
+        </authors>
+    </header>
+
+    <body>
+        <section title="Branching Conventions">
+            <p>
+                Branches are tagged in the following way:
+            </p>
+            <ul>
+                <li>REL_1_5_BRANCH</li>
+                <li>REL_2_0_BRANCH</li>
+            </ul>
+            <p>
+                Merge points should be tagged as follows:
+            </p>
+            <ul>
+                <li>REL_1_5_BRANCH_MERGE1</li>
+                <li>REL_1_5_BRANCH_MERGE2</li>
+                <li>etc...</li>
+            </ul>
+            <p>
+                Releases should be tagged as:
+            </p>
+            <ul>
+                <li>REL_1_5</li>
+                <li>REL_1_5_1</li>
+                <li>REL_1_5_2</li>
+                <li>etc...</li>
+            </ul>
+
+        </section>
+        <section title="Branching Advise">
+            <p>
+              Don't forget which branch you are currently on.  This is critically
+              important.  Committing stuff to the wrong branch causes all sorts of
+              headaches.  Best to name your checkout after the branch you are on.
+            </p>
+        </section>
+        <section title="Who Manages Branching?">
+            <p>
+                All branching is currently managed by Glen Stampoultzis.  If you wish
+                to create your own branch please let him know.  Merging is also
+                handled by Glen.  Just pop him a mail if you feel it's necessary to
+                create a branch or perform a merge.
+            </p>
+            <p>
+                The reason to go through a single point for branching is that it can be
+                an easy thing to get wrong.  Having a single person managing branches
+                means there is less chance of getting getting our wires crossed with this
+                difficult area of CVS.
+            </p>
+        </section>
+        <section title="Currently Active Branches">
+            <p>
+                The following branches are currently active:
+            </p>
+            <table>
+                <tr>
+                    <th>
+                        <b>Branch</b>
+                    </th>
+                    <th>
+                        <b>Description</b>
+                    </th>
+                </tr>
+                <tr>
+                    <td>
+                        HEAD
+                    </td>
+                    <td>
+                    This is the trunk and is always active.  Currently it is being used to continue development
+                    of the 2.0 release.
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        REL_1_5_BRANCH
+                    </td>
+                    <td>
+                        All bug fixes not specifically relevant to the 2.0 work should be placed in this branch.
+                        From here they will merged back to the trunk and the merge point marked.
+                    </td>
+                </tr>
+            </table>
+        </section>
+    </body>
+
+</document>
\ No newline at end of file
diff --git a/src/documentation/xdocs/changes.xml b/src/documentation/xdocs/changes.xml
index 36223b2ff..9540dcfd7 100644
--- a/src/documentation/xdocs/changes.xml
+++ b/src/documentation/xdocs/changes.xml
@@ -11,7 +11,11 @@
         <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
         <person id="POI-DEVELOPERS" name="Poi Developers"    email="poi-dev@jakarta.apache.org"/>
     </devs>
-    <release version="1.5" date="Coming Soon">
+    <release version="1.5.1" date="16 June 2002">
+        <action dev="GJS" type="update">Removed depedency on commons logging.  Now define poi.logging system property to enable logging to standard out.</action>
+        <action dev="GJS" type="fix">Fixed SST string handling so that spreadsheets with rich text or extended text will be read correctly.</action>
+    </release>
+    <release version="1.5" date="06 May 2002">
         <action dev="NKB" type="update">New project build.</action>
         <action dev="NKB" type="update">New project documentation system based on Cocoon.</action>
         <action dev="POI-DEVELOPERS" type="update">Package rename</action>
diff --git a/src/documentation/xdocs/historyandfuture.xml b/src/documentation/xdocs/historyandfuture.xml
index 3855480f6..741f6aad5 100755
--- a/src/documentation/xdocs/historyandfuture.xml
+++ b/src/documentation/xdocs/historyandfuture.xml
@@ -3,7 +3,7 @@
 
 <document>
   <header>
-    <title></title>
+    <title>Project History</title>
     <authors>
       <person id="AO" name="Andrew C. Oliver" email="acoliver@apache.org"/>
     </authors>
diff --git a/src/documentation/xdocs/hssf/how-to.xml b/src/documentation/xdocs/hssf/how-to.xml
index 8c5d930db..2ad13bec8 100644
--- a/src/documentation/xdocs/hssf/how-to.xml
+++ b/src/documentation/xdocs/hssf/how-to.xml
@@ -397,55 +397,20 @@ export CLASSPATH=$CLASSPATH:$HSSFDIR/hssf.jar:$HSSFDIR/poi-poifs.jar:$HSSFDIR/po
 <ul>
 	<li>Type:
 	<code>java org.apache.poi.hssf.dev.HSSF ~/input.xls output.xls</code>
-    <p>
+    <br/>
+    <br/>
 This is the read/write/modify test.  It reads in the spreadsheet, modifies a cell, and writes it back out.
 Failing this test is not necessarily a bad thing.  If HSSF tries to modify a non-existant sheet then this will
-most likely fail.  No big deal.  </p></li>
+most likely fail.  No big deal.  </li>
 </ul>
      </section>
-                <section title="HSSF Logging facility">
-<p>HSSF now has a logging facility (using
- <link href="http://jakarta.apache.org/commons/logging.html">commons logging</link>)
-that will record massive amounts of debugging information. Its mostly
-useful to us hssf-developing geeks, but might be useful in tracking
-down problems.
-</p>
-<p>So Why use commons logging rather than log4j? Well the following discussion from
-the jakarta-general mailing list sums it up pretty well.  (Thanks Morgan)
-</p>
-<p><em>Here's the problem, as I see it.</em>
-</p>
-<p><em>Suppose Commons component A decides to adopt Log4J, Commons component B
-decides to adopt LogKit, and Commons component C adopts JDK1.4 logging.
-They will all minimally function with the right jars in the classpath.
-However you (the end-user) are left with maintaining configuration for 3
-different logging APIs, which is tedious at best.  When you take into
-account cool features like variable log levels, Log4J appenders and the
-like, you're pretty much guaranteed to swallow up useful configuration
-options because sophisticated configurations are too difficult to maintain
-over mutiple logging implementations.</em>
-</p>
+                <section title="HSSF Logging Facility">
 <p>
-<em>Contrarily, if all three Commons components use a logging facade, you can
-focus all your configuration efforts on one logging implementation.  Sure,
-there is a trade-off; you don't have access to all the features, and the
-interface between the facade and the implementation must be maintained.  But
-the benefits are not just political; they potentially make the end-users
-configuration much easier.</em>
-</p>
-<p><em>Even if all Commons components used the same logging implementation (Log4J
-for example), other projects in Jakarta-land may choose otherwise.  If you
-add enough Jakarta projects to your environment, you eventually end up with
-the scenario described above.  It's a worthwhile effort to attempt a logging
-solution that plays well with the Jakarta community at large.  I think in
-many cases the Commons Logging component can fill that role.</em>
-</p>
-<p>
-Refer to the commons logging package level javadoc for more information concerning how to
-<link href="http://jakarta.apache.org/commons/logging/api/index.html">configure commons logging.</link>
+    POI has a small amount of logging code embedded within it.  Defining the system property
+    poi.logging will enable logging to standard out.
 </p>
      </section>
-                <section title="HSSF Developer's tools">
+                <section title="HSSF Developer's Tools">
 
 <p>HSSF has a number of tools useful for developers to debug/develop
 stuff using HSSF (and more generally XLS files). We've already
diff --git a/src/documentation/xdocs/hssf/quick-guide.xml b/src/documentation/xdocs/hssf/quick-guide.xml
index 2d660255d..53eaee8c2 100644
--- a/src/documentation/xdocs/hssf/quick-guide.xml
+++ b/src/documentation/xdocs/hssf/quick-guide.xml
@@ -28,6 +28,7 @@
                     <li><link href="#MergedCells">Merging cells</link></li>
                     <li><link href="#WorkingWithFonts">Working with fonts</link></li>
                     <li><link href="#ReadWriteWorkbook">Reading and writing</link></li>
+                    <li><link href="#NewLinesInCells">Use newlines in cells.</link></li>
                 </ul>
             </section>
             <section title="Features">
@@ -294,6 +295,35 @@
     fileOut.close();
                     </source>
                 </section>
+                <anchor id="UseNewLinesInCells"/>
+                <section title="Using newlines in cells">
+                    <source>
+    HSSFWorkbook wb = new HSSFWorkbook();
+    HSSFSheet s = wb.createSheet();
+    HSSFRow r = null;
+    HSSFCell c = null;
+    HSSFCellStyle cs = wb.createCellStyle();
+    HSSFFont f = wb.createFont();
+    HSSFFont f2 = wb.createFont();
+
+    cs = wb.createCellStyle();
+
+    cs.setFont( f2 );
+    //Word Wrap MUST be turned on
+    cs.setWrapText( true );
+
+    r = s.createRow( (short) 2 );
+    r.setHeight( (short) 0x349 );
+    c = r.createCell( (short) 2 );
+    c.setCellType( HSSFCell.CELL_TYPE_STRING );
+    c.setCellValue( "Use \n with word wrap on to create a new line" );
+    c.setCellStyle( cs );
+    s.setColumnWidth( (short) 2, (short) ( ( 50 * 8 ) / ( (double) 1 / 20 ) ) );
+
+    FileOutputStream fileOut = new FileOutputStream( "workbook.xls" );
+    wb.write( fileOut );
+    fileOut.close();</source>
+                </section>
             </section>
         </section>
     </body>
diff --git a/src/documentation/xdocs/news/logocontest.xml b/src/documentation/xdocs/news/logocontest.xml
index 9c45d06c6..9d9179c86 100644
--- a/src/documentation/xdocs/news/logocontest.xml
+++ b/src/documentation/xdocs/news/logocontest.xml
@@ -2,114 +2,139 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
-  <header>
-    <title></title>
-    <authors>
-      <person id="AO" name="Andrew C. Oliver" email="acoliver@apache.org"/>
-    </authors>
-  </header>
-  
-  <body>
-    <section title="POI logos">
-        <p>
-                Here are the current logo submissions.  Thanks to the artists!
-        </p>
-        <section title="Michael Mosmann">
+    <header>
+        <title></title>
+        <authors>
+            <person id="AO" name="Andrew C. Oliver" email="acoliver@apache.org"/>
+            <person id="GS" name="Glen Stampoultzis" email="glens@apache.org"/>
+        </authors>
+    </header>
+
+    <body>
+        <section title="POI logos">
+            <p>
+                    Here are the current logo submissions.  Thanks to the artists!
+            </p>
+            <section title="Michael Mosmann">
                 <p>
-                <img src="images/logoMichaelMosmann.png"/>
+                    <img src="images/logoMichaelMosmann.png"/>
                 </p>
+            </section>
+            <section title="Loïc Lefèvre">
+                <p>
+                    <img src="images/logoLoicLefevre.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoLoicLefevre2.png"/>
+                </p>
+            </section>
+            <section title="Glen Stampoultzis">
+                <p>
+                    <img src="images/logoGlenStampoutlzis.png"/>
+                </p>
+            </section>
+            <section title="Marcus Gustafsson">
+                <p>
+                    <img src="images/logoGustafsson1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoGustafsson2.png"/>
+                </p>
+            </section>
+            <section title="Adrianus Handoyo">
+                <p>
+                    <img src="images/logoAdria1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoAdria2.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoAdria3.png"/>
+                </p>
+            </section>
+            <section title="RussellBeattie">
+                <p>
+                    <img src="images/logoRussellBeattie1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoRussellBeattie2.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoRussellBeattie3.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRussellBeattie4.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoRussellBeattie5.png"/>
+                </p>
+            </section>
+            <section title="Daniel Fernandez">
+                <p>
+                    <img src="images/logoDanielFernandez.png"/>
+                </p>
+            </section>
+            <section title="Andrew Clements">
+                <p>
+                    <img src="images/logoAndrewClements.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoAndrewClements2.png"/>
+                </p>
+            </section>
+            <section title="Wendy Wise">
+                <p>
+                    <img src="images/logoWendyWise.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoWendyWise2.png"/>
+                </p>
+            </section>
+            <section title="Nikhil Karmokar">
+                <p>
+                    <img src="images/logoKarmokar1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar1s.png"/>
+                </p>
+                <p>
+                    <img src="images/logoKarmokar2.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar2s.png"/>
+                </p>
+                <p>
+                    <img src="images/logoKarmokar3.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar3s.png"/>
+                </p>
+                <p>
+                    <img src="images/logoKarmokar4.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar4s.png"/>
+                </p>
+                <p>
+                    <img src="images/logoKarmokar5.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar5s.png"/>
+                </p>
+                <p>
+                    <img src="images/logoKarmokar6.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoKarmokar6s.png"/>
+                </p>
+            </section>
+            <section title="Lieven Janssen">
+                <p>
+                    <img src="images/logoJanssen1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoJanssen2.png"/>
+                </p>
+            </section>
+            <section title="RaPi GmbH">
+                <p>
+                    Contact Person: Fancy at: fancy at my-feiqi.com
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH1.png"/>&nbsp;&nbsp;&nbsp;
+                    <img src="images/logoRaPiGmbH2.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH3.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH4.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH5.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH6.png"/>
+                </p>
+                <p>
+                    <img src="images/logoRaPiGmbH7.png"/>
+                </p>
+            </section>
+
         </section>
-        <section title="Loïc Lefèvre">
-                <p>
-                <img src="images/logoLoicLefevre.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoLoicLefevre2.png"/>
-                </p>
-        </section>
-        <section title="Glen Stampoultzis">
-                <p>
-                <img src="images/logoGlenStampoutlzis.png"/>
-                </p>
-        </section>
-        <section title="Marcus Gustafsson">
-                <p>
-                <img src="images/logoGustafsson1.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoGustafsson2.png"/>
-                </p>
-        </section>
-        <section title="Adrianus Handoyo">
-                <p>
-                <img src="images/logoAdria1.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoAdria2.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoAdria3.png"/>
-                </p>
-        </section>
-        <section title="RussellBeattie">
-                <p>
-                <img src="images/logoRussellBeattie1.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoRussellBeattie2.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoRussellBeattie3.png"/>
-                </p>
-                <p>
-                <img src="images/logoRussellBeattie4.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoRussellBeattie5.png"/>                
-                </p>
-        </section>        
-        <section title="Daniel Fernandez">
-                <p>
-                <img src="images/logoDanielFernandez.png"/>
-                </p>
-        </section>
-        <section title="Andrew Clements">
-                <p>
-                <img src="images/logoAndrewClements.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoAndrewClements2.png"/>
-                </p>
-        </section>
-        <section title="Wendy Wise">
-                <p>
-                <img src="images/logoWendyWise.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoWendyWise2.png"/>
-                </p>
-        </section>
-        <section title="Nikhil Karmokar">
-                <p>
-                <img src="images/logoKarmokar1.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar1s.png"/>
-                </p>
-                <p>
-                <img src="images/logoKarmokar2.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar2s.png"/>
-                </p>
-                <p>
-                <img src="images/logoKarmokar3.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar3s.png"/>
-                </p>
-                <p>
-                <img src="images/logoKarmokar4.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar4s.png"/>
-                </p>
-                <p>
-                <img src="images/logoKarmokar5.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar5s.png"/>
-                </p>
-                <p>
-                <img src="images/logoKarmokar6.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoKarmokar6s.png"/>
-                </p>
-        </section>
-        <section title="Lieven Janssen">
-                <p>
-                <img src="images/logoJanssen1.png"/>&nbsp;&nbsp;&nbsp;
-                <img src="images/logoJanssen2.png"/>
-                </p>
-        </section>
-        
-    </section>    
-  </body>
-  <footer>
-    <legal>
-      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
-      $Revision$ $Date$
-    </legal>
-  </footer>
+    </body>
+    <footer>
+        <legal>
+          Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+          $Revision$ $Date$
+        </legal>
+    </footer>
 </document>
diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java
new file mode 100644
index 000000000..517234fc9
--- /dev/null
+++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java
@@ -0,0 +1,100 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache POI" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache POI", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.poi.hssf.usermodel.examples;
+
+import org.apache.poi.hssf.usermodel.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Demonstrates how to use newlines in cells.
+ *
+ * @author Glen Stampoultzis (glens at apache.org)
+ * @author Fauzia Lala <fauzia.lala at wcom.com>
+ */
+public class NewLinesInCells
+{
+    public static void main( String[] args ) throws IOException
+    {
+
+        HSSFWorkbook wb = new HSSFWorkbook();
+        HSSFSheet s = wb.createSheet();
+        HSSFRow r = null;
+        HSSFCell c = null;
+        HSSFCellStyle cs = wb.createCellStyle();
+        HSSFFont f = wb.createFont();
+        HSSFFont f2 = wb.createFont();
+
+        cs = wb.createCellStyle();
+
+        cs.setFont( f2 );
+        //Word Wrap MUST be turned on
+        cs.setWrapText( true );
+
+        r = s.createRow( (short) 2 );
+        r.setHeight( (short) 0x349 );
+        c = r.createCell( (short) 2 );
+        c.setCellType( HSSFCell.CELL_TYPE_STRING );
+        c.setCellValue( "Use \n with word wrap on to create a new line" );
+        c.setCellStyle( cs );
+        s.setColumnWidth( (short) 2, (short) ( ( 50 * 8 ) / ( (double) 1 / 20 ) ) );
+
+        FileOutputStream fileOut = new FileOutputStream( "workbook.xls" );
+        wb.write( fileOut );
+        fileOut.close();
+
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
index 12267d23d..7d366f145 100644
--- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
@@ -631,12 +631,12 @@ public class BiffViewer
                 retval = new LinkedDataRecord(rectype, size, data);
                 break;
                 
-            case FormulaRecord.sid:
-                retval = new FormulaRecord(rectype, size, data);
-                break;
+//            case FormulaRecord.sid:
+//                retval = new FormulaRecord(rectype, size, data);
+//                break;
                 
             case SheetPropertiesRecord.sid:
-                retval = new FormulaRecord(rectype, size, data);
+                retval = new SheetPropertiesRecord(rectype, size, data);
                 break;
 
 
diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index d45153f9c..55fe65932 100644
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -643,26 +643,11 @@ public class Workbook
     {
         log.log(DEBUG, "Serializing Workbook with offsets");
 
-        // ArrayList bytes     = new ArrayList(records.size());
-//        int arraysize = getSize();   // 0;
         int pos       = 0;
 
-//        for (int k = 0; k < records.size(); k++)
-//        {
-//            bytes.add((( Record ) records.get(k)).serialize());
-//
-//        }
-//        for (int k = 0; k < bytes.size(); k++)
-//       {
-//            arraysize += (( byte [] ) bytes.get(k)).length;
-//        }
         for (int k = 0; k < records.size(); k++)
         {
-
-            // byte[] rec = (( byte [] ) bytes.get(k));
-            // System.arraycopy(rec, 0, data, offset + pos, rec.length);
-            pos += (( Record ) records.get(k)).serialize(pos + offset,
-                    data);   // rec.length;
+            pos += (( Record ) records.get(k)).serialize(pos + offset, data);   // rec.length;
         }
         log.log(DEBUG, "Exiting serialize workbook");
         return pos;
diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/src/java/org/apache/poi/hssf/record/ContinueRecord.java
index 2b67a62d4..5017ade92 100644
--- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ContinueRecord.java
@@ -161,9 +161,7 @@ public class ContinueRecord
 
         // how many continue records do we need
         // System.out.println("In ProcessContinue");
-        int       records   =
-            (data.length
-             / 8214);   // we've a 1 offset but we're also off by one due to rounding...so it balances out
+        int       records   = (data.length / 8214);   // we've a 1 offset but we're also off by one due to rounding...so it balances out
         int       offset    = 8214;
 
         // System.out.println("we have "+records+" continue records to process");
@@ -174,8 +172,7 @@ public class ContinueRecord
         for (int cr = 0; cr < records; cr++)
         {
             ContinueRecord contrec   = new ContinueRecord();
-            int            arraysize = Math.min((8214 - 4),
-                                                (data.length - offset));
+            int            arraysize = Math.min((8214 - 4), (data.length - offset));
             byte[]         crdata    = new byte[ arraysize ];
 
             System.arraycopy(data, offset, crdata, 0, arraysize);
diff --git a/src/java/org/apache/poi/hssf/record/RecordProcessor.java b/src/java/org/apache/poi/hssf/record/RecordProcessor.java
new file mode 100644
index 000000000..13bfc3a18
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/RecordProcessor.java
@@ -0,0 +1,202 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache POI" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache POI", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.poi.hssf.record;
+
+import org.apache.poi.util.LittleEndianConsts;
+import org.apache.poi.util.LittleEndian;
+
+/**
+ * Process a single record.  That is, an SST record or a continue record.
+ * Refactored from code originally in SSTRecord.
+ *
+ * @author Glen Stampoultzis (glens at apache.org)
+ */
+class RecordProcessor
+{
+    private byte[] data;
+    private int recordOffset;
+    private int available;
+    private SSTRecordHeader sstRecordHeader;
+
+    public RecordProcessor( byte[] data, int available, int numStrings, int numUniqueStrings )
+    {
+        this.data = data;
+        this.available = available;
+        this.sstRecordHeader = new SSTRecordHeader(numStrings, numUniqueStrings);
+    }
+
+    public int getAvailable()
+    {
+        return available;
+    }
+
+    public void writeRecordHeader( int offset, int totalWritten, int recordLength, boolean first_record )
+    {
+        if ( first_record )
+        {
+            available -= 8;
+            recordOffset = sstRecordHeader.writeSSTHeader( data, recordOffset + offset + totalWritten, recordLength );
+        }
+        else
+        {
+            recordOffset = writeContinueHeader( data, recordOffset + offset + totalWritten, recordLength );
+        }
+    }
+
+    public byte[] writeStringRemainder( boolean lastStringCompleted, byte[] stringreminant, int offset, int totalWritten )
+    {
+        if ( !lastStringCompleted )
+        {
+            // write reminant -- it'll all fit neatly
+            System.arraycopy( stringreminant, 0, data, recordOffset + offset + totalWritten, stringreminant.length );
+            adjustPointers( stringreminant.length );
+        }
+        else
+        {
+            // write as much of the remnant as possible
+            System.arraycopy( stringreminant, 0, data, recordOffset + offset + totalWritten, available );
+            byte[] leftover = new byte[( stringreminant.length - available ) + LittleEndianConsts.BYTE_SIZE];
+
+            System.arraycopy( stringreminant, available, leftover, LittleEndianConsts.BYTE_SIZE, stringreminant.length - available );
+            leftover[0] = stringreminant[0];
+            stringreminant = leftover;
+            adjustPointers( available );    // Consume all available remaining space
+        }
+        return stringreminant;
+    }
+
+    public void writeWholeString( UnicodeString unistr, int offset, int totalWritten )
+    {
+        unistr.serialize( recordOffset + offset + totalWritten, data );
+        int rsize = unistr.getRecordSize();
+        adjustPointers( rsize );
+    }
+
+    public byte[] writePartString( UnicodeString unistr, int offset, int totalWritten )
+    {
+        byte[] stringReminant;
+        byte[] ucs = unistr.serialize();
+
+        System.arraycopy( ucs, 0, data, recordOffset + offset + totalWritten, available );
+        stringReminant = new byte[( ucs.length - available ) + LittleEndianConsts.BYTE_SIZE];
+        System.arraycopy( ucs, available, stringReminant, LittleEndianConsts.BYTE_SIZE, ucs.length - available );
+        stringReminant[0] = ucs[LittleEndianConsts.SHORT_SIZE];
+        available = 0;
+        return stringReminant;
+    }
+
+
+    private int writeContinueHeader( final byte[] data, final int pos,
+                                     final int recsize )
+    {
+        int offset = pos;
+
+        LittleEndian.putShort( data, offset, ContinueRecord.sid );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        LittleEndian.putShort( data, offset, (short) ( recsize ) );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        return offset - pos;
+    }
+
+
+    private void adjustPointers( int amount )
+    {
+        recordOffset += amount;
+        available -= amount;
+    }
+}
+
+class SSTRecordHeader
+{
+    int numStrings;
+    int numUniqueStrings;
+
+    /**
+     *
+     */
+    public SSTRecordHeader( int numStrings, int numUniqueStrings )
+    {
+        this.numStrings = numStrings;
+        this.numUniqueStrings = numUniqueStrings;
+    }
+
+    /**
+     * Writes out the SST record.  This consists of the sid, the record size, the number of
+     * strings and the number of unique strings.
+     *
+     * @param data          The data buffer to write the header to.
+     * @param bufferIndex   The index into the data buffer where the header should be written.
+     * @param recSize       The number of records written.
+     *
+     * @return The bufer of bytes modified.
+     */
+    public int writeSSTHeader( byte[] data, int bufferIndex, int recSize )
+    {
+        int offset = bufferIndex;
+
+        LittleEndian.putShort( data, offset, SSTRecord.sid );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        LittleEndian.putShort( data, offset, (short) ( recSize ) );
+        offset += LittleEndianConsts.SHORT_SIZE;
+//        LittleEndian.putInt( data, offset, getNumStrings() );
+        LittleEndian.putInt( data, offset, numStrings );
+        offset += LittleEndianConsts.INT_SIZE;
+//        LittleEndian.putInt( data, offset, getNumUniqueStrings() );
+        LittleEndian.putInt( data, offset, numUniqueStrings );
+        offset += LittleEndianConsts.INT_SIZE;
+        return offset - bufferIndex;
+    }
+
+}
\ No newline at end of file
diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/src/java/org/apache/poi/hssf/record/RowRecord.java
index 65b627ea5..fc29fcbd2 100644
--- a/src/java/org/apache/poi/hssf/record/RowRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RowRecord.java
@@ -452,8 +452,8 @@ public class RowRecord
         LittleEndian.putShort(data, 0 + offset, sid);
         LittleEndian.putShort(data, 2 + offset, ( short ) 16);
         LittleEndian.putShort(data, 4 + offset, getRowNumber());
-        LittleEndian.putShort(data, 6 + offset, getFirstCol());
-        LittleEndian.putShort(data, 8 + offset, getLastCol());
+        LittleEndian.putShort(data, 6 + offset, getFirstCol() == -1 ? (short)0 : getFirstCol());
+        LittleEndian.putShort(data, 8 + offset, getLastCol() == -1 ? (short)0 : getLastCol());
         LittleEndian.putShort(data, 10 + offset, getHeight());
         LittleEndian.putShort(data, 12 + offset, getOptimize());
         LittleEndian.putShort(data, 14 + offset, field_6_reserved);
diff --git a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
new file mode 100644
index 000000000..c4698df0f
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
@@ -0,0 +1,562 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache POI" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache POI", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.poi.hssf.record;
+
+import org.apache.poi.util.BinaryTree;
+import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
+
+/**
+ * Handles the task of deserializing a SST string.  The two main entry points are
+ *
+ * @author Glen Stampoultzis (glens at apache.org)
+ */
+class SSTDeserializer
+{
+
+    private BinaryTree strings;
+    /** this is the number of characters we expect in the first sub-record in a subsequent continuation record */
+    private int continuationExpectedChars;
+    /** this is the string we were working on before hitting the end of the current record. This string is NOT finished. */
+    private String unfinishedString;
+    /** this is true if the string uses wide characters */
+    private boolean wideChar;
+    /** this is true if the string is a rich text string */
+    private boolean richText;
+    /** this is true if the string is a far east string or some other wierd string */
+    private boolean extendedText;
+    /** Number of formatting runs in this rich text field */
+    private short runCount;
+    /** Number of characters in current string */
+    private int charCount;
+    private int extensionLength;
+
+
+    public SSTDeserializer( BinaryTree strings )
+    {
+        this.strings = strings;
+        initVars();
+    }
+
+    private void initVars()
+    {
+        runCount = 0;
+        continuationExpectedChars = 0;
+        unfinishedString = "";
+//        bytesInCurrentSegment = 0;
+//        stringDataOffset = 0;
+        wideChar = false;
+        richText = false;
+        extendedText = false;
+    }
+
+    /**
+     * This is the starting point where strings are constructed.  Note that
+     * strings may span across multiple continuations. Read the SST record
+     * carefully before beginning to hack.
+     */
+    public void manufactureStrings( final byte[] data, final int initialOffset, short dataSize )
+    {
+        initVars();
+
+        int offset = initialOffset;
+        while ( ( offset - initialOffset ) < dataSize )
+        {
+            int remaining = dataSize - offset + initialOffset;
+
+            if ( ( remaining > 0 ) && ( remaining < LittleEndianConsts.SHORT_SIZE ) )
+            {
+                throw new RecordFormatException( "Cannot get length of the last string in SSTRecord" );
+            }
+            if ( remaining == LittleEndianConsts.SHORT_SIZE )
+            {
+                setContinuationExpectedChars( LittleEndian.getUShort( data, offset ) );
+                unfinishedString = "";
+                break;
+            }
+            charCount = LittleEndian.getUShort( data, offset );
+            readStringHeader( data, offset );
+            boolean stringContinuesOverContinuation = remaining < totalStringSize();
+            if ( stringContinuesOverContinuation )
+            {
+                int remainingBytes = ( initialOffset + dataSize ) - offset - stringHeaderOverhead();
+                setContinuationExpectedChars( charCount - calculateCharCount( remainingBytes ) );
+                charCount -= getContinuationExpectedChars();
+            }
+            else
+            {
+                setContinuationExpectedChars( 0 );
+            }
+            processString( data, offset, charCount );
+            offset += totalStringSize();
+            if ( getContinuationExpectedChars() != 0 )
+            {
+                break;
+            }
+        }
+    }
+
+//    private void dump( final byte[] data, int offset, int length )
+//    {
+//        try
+//        {
+//            System.out.println( "------------------- SST DUMP -------------------------" );
+//            HexDump.dump( (byte[]) data, offset, System.out, offset, length );
+//        }
+//        catch ( IOException e )
+//        {
+//        }
+//        catch ( ArrayIndexOutOfBoundsException e )
+//        {
+//        }
+//        catch ( IllegalArgumentException e )
+//        {
+//        }
+//    }
+
+    /**
+     * Detemines the option types for the string (ie, compressed or uncompressed unicode, rich text string or
+     * plain string etc) and calculates the length and offset for the string.
+     *
+     */
+    private void readStringHeader( final byte[] data, final int index )
+    {
+
+        byte optionFlag = data[index + LittleEndianConsts.SHORT_SIZE];
+
+        wideChar = ( optionFlag & 1 ) == 1;
+        extendedText = ( optionFlag & 4 ) == 4;
+        richText = ( optionFlag & 8 ) == 8;
+        runCount = 0;
+        if ( richText )
+        {
+            runCount = LittleEndian.getShort( data, index + SSTRecord.STRING_MINIMAL_OVERHEAD );
+        }
+        extensionLength = 0;
+        if ( extendedText )
+        {
+            extensionLength = LittleEndian.getInt( data, index + SSTRecord.STRING_MINIMAL_OVERHEAD
+                    + (richText ? LittleEndianConsts.SHORT_SIZE : 0) );
+        }
+
+    }
+
+
+    /**
+     * Reads a string or the first part of a string.
+     *
+     * @param characters the number of characters to write.
+     *
+     * @return the number of bytes written.
+     */
+    private int processString( final byte[] data, final int dataIndex, final int characters )
+    {
+
+        // length is the length we store it as.  not the length that is read.
+        int length = SSTRecord.STRING_MINIMAL_OVERHEAD + calculateByteCount( characters );
+        byte[] unicodeStringBuffer = new byte[length];
+
+        int offset = 0;
+
+        // Set the length in characters
+        LittleEndian.putUShort( unicodeStringBuffer, offset, characters );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        // Set the option flags
+        unicodeStringBuffer[offset] = data[dataIndex + offset];
+        // Copy in the string data
+        int bytesRead = unicodeStringBuffer.length - SSTRecord.STRING_MINIMAL_OVERHEAD;
+        arraycopy( data, dataIndex + stringHeaderOverhead(), unicodeStringBuffer, SSTRecord.STRING_MINIMAL_OVERHEAD, bytesRead );
+        // Create the unicode string
+        UnicodeString string = new UnicodeString( UnicodeString.sid,
+                (short) unicodeStringBuffer.length,
+                unicodeStringBuffer );
+
+        if ( isStringFinished() )
+        {
+            Integer integer = new Integer( strings.size() );
+            addToStringTable( strings, integer, string );
+        }
+        else
+        {
+            unfinishedString = string.getString();
+        }
+
+        return bytesRead;
+    }
+
+    private boolean isStringFinished()
+    {
+        return getContinuationExpectedChars() == 0;
+    }
+
+    /**
+     * Okay, we are doing some major cheating here. Because we can't handle rich text strings properly
+     * we end up getting duplicate strings.  To get around this I'm doing two things: 1. Converting rich
+     * text to normal text and 2. If there's a duplicate I'm adding a space onto the end.  Sneaky perhaps
+     * but it gets the job done until we can handle this a little better.
+     */
+    static public void addToStringTable( BinaryTree strings, Integer integer, UnicodeString string )
+    {
+
+        if ( string.isRichText() )
+            string.setOptionFlags( (byte) ( string.getOptionFlags() & ( ~8 ) ) );
+        if ( string.isExtendedText() )
+            string.setOptionFlags( (byte) ( string.getOptionFlags() & ( ~4 ) ) );
+
+        boolean added = false;
+        while ( added == false )
+        {
+            try
+            {
+                strings.put( integer, string );
+                added = true;
+            }
+            catch ( Exception ignore )
+            {
+                string.setString( string.getString() + " " );
+            }
+        }
+
+    }
+
+
+    private int calculateCharCount( final int byte_count )
+    {
+        return byte_count / ( wideChar ? LittleEndianConsts.SHORT_SIZE : LittleEndianConsts.BYTE_SIZE );
+    }
+
+    /**
+     * Process a Continue record. A Continue record for an SST record
+     * contains the same kind of data that the SST record contains,
+     * with the following exceptions:
+     * <P>
+     * <OL>
+     * <LI>The string counts at the beginning of the SST record are
+     *     not in the Continue record
+     * <LI>The first string in the Continue record might NOT begin
+     *     with a size. If the last string in the previous record is
+     *     continued in this record, the size is determined by that
+     *     last string in the previous record; the first string will
+     *     begin with a flag byte, followed by the remaining bytes (or
+     *     words) of the last string from the previous
+     *     record. Otherwise, the first string in the record will
+     *     begin with a string length
+     * </OL>
+     *
+     * @param record the Continue record's byte data
+     */
+    public void processContinueRecord( final byte[] record )
+    {
+        if ( isStringFinished() )
+        {
+            initVars();
+            manufactureStrings( record, 0, (short) record.length );
+        }
+        else
+        {
+            // reset the wide bit because that can change across a continuation. the fact that it's
+            // actually rich text doesn't change across continuations even though the rich text
+            // may on longer be set in the "new" option flag.  confusing huh?
+            wideChar = ( record[0] & 1 ) == 1;
+
+            if ( stringSpansContinuation( record.length - LittleEndianConsts.BYTE_SIZE ) )
+            {
+                processEntireContinuation( record );
+            }
+            else
+            {
+                readStringRemainder( record );
+            }
+        }
+
+    }
+
+    /**
+     * Reads the remainder string and any subsequent strings from the continuation record.
+     *
+     * @param record  The entire continuation record data.
+     */
+    private void readStringRemainder( final byte[] record )
+    {
+        int stringRemainderSizeInBytes = calculateByteCount( getContinuationExpectedChars() );
+//        stringDataOffset = LittleEndianConsts.BYTE_SIZE;
+        byte[] unicodeStringData = new byte[SSTRecord.STRING_MINIMAL_OVERHEAD
+                + calculateByteCount( getContinuationExpectedChars() )];
+
+        // write the string length
+        LittleEndian.putShort( unicodeStringData, 0, (short) getContinuationExpectedChars() );
+
+        // write the options flag
+        unicodeStringData[LittleEndianConsts.SHORT_SIZE] = createOptionByte( wideChar, richText, extendedText );
+
+        // copy the bytes/words making up the string; skipping
+        // past all the overhead of the str_data array
+        arraycopy( record, LittleEndianConsts.BYTE_SIZE, unicodeStringData,
+                SSTRecord.STRING_MINIMAL_OVERHEAD,
+                unicodeStringData.length - SSTRecord.STRING_MINIMAL_OVERHEAD );
+
+        // use special constructor to create the final string
+        UnicodeString string = new UnicodeString( UnicodeString.sid,
+                (short) unicodeStringData.length, unicodeStringData,
+                unfinishedString );
+        Integer integer = new Integer( strings.size() );
+
+        addToStringTable( strings, integer, string );
+
+        int newOffset = offsetForContinuedRecord( stringRemainderSizeInBytes );
+        manufactureStrings( record, newOffset, (short) ( record.length - newOffset ) );
+    }
+
+    /**
+     * Calculates the size of the string in bytes based on the character width
+     */
+    private int stringSizeInBytes()
+    {
+        return calculateByteCount( charCount );
+    }
+
+    /**
+     * Calculates the size of the string in byes.  This figure includes all the over
+     * heads for the string.
+     */
+    private int totalStringSize()
+    {
+        return stringSizeInBytes()
+                + stringHeaderOverhead()
+                + LittleEndianConsts.INT_SIZE * runCount
+                + extensionLength;
+    }
+
+    private int stringHeaderOverhead()
+    {
+        return SSTRecord.STRING_MINIMAL_OVERHEAD
+                + ( richText ? LittleEndianConsts.SHORT_SIZE : 0 )
+                + ( extendedText ? LittleEndianConsts.INT_SIZE : 0 );
+    }
+
+    private int offsetForContinuedRecord( int stringRemainderSizeInBytes )
+    {
+        return stringRemainderSizeInBytes + LittleEndianConsts.BYTE_SIZE
+                + runCount * LittleEndianConsts.INT_SIZE + extensionLength;
+    }
+
+    private byte createOptionByte( boolean wideChar, boolean richText, boolean farEast )
+    {
+        return (byte) ( ( wideChar ? 1 : 0 ) + ( farEast ? 4 : 0 ) + ( richText ? 8 : 0 ) );
+    }
+
+    /**
+     * If the continued record is so long is spans into the next continue then
+     * simply suck the remaining string data into the existing <code>unfinishedString</code>.
+     *
+     * @param record    The data from the continuation record.
+     */
+    private void processEntireContinuation( final byte[] record )
+    {
+        // create artificial data to create a UnicodeString
+        int dataLengthInBytes = record.length - LittleEndianConsts.BYTE_SIZE;
+        byte[] unicodeStringData = new byte[record.length + LittleEndianConsts.SHORT_SIZE];
+
+        LittleEndian.putShort( unicodeStringData, (byte) 0, (short) calculateCharCount( dataLengthInBytes ) );
+        arraycopy( record, 0, unicodeStringData, LittleEndianConsts.SHORT_SIZE, record.length );
+        UnicodeString ucs = new UnicodeString( UnicodeString.sid, (short) unicodeStringData.length, unicodeStringData );
+
+        unfinishedString = unfinishedString + ucs.getString();
+        setContinuationExpectedChars( getContinuationExpectedChars() - calculateCharCount( dataLengthInBytes ) );
+    }
+
+    private boolean stringSpansContinuation( int continuationSizeInBytes )
+    {
+        return calculateByteCount( getContinuationExpectedChars() ) > continuationSizeInBytes;
+    }
+
+    /**
+     * @return the number of characters we expect in the first
+     *         sub-record in a subsequent continuation record
+     */
+
+    int getContinuationExpectedChars()
+    {
+        return continuationExpectedChars;
+    }
+
+    private void setContinuationExpectedChars( final int count )
+    {
+        continuationExpectedChars = count;
+    }
+
+    private int calculateByteCount( final int character_count )
+    {
+        return character_count * ( wideChar ? LittleEndianConsts.SHORT_SIZE : LittleEndianConsts.BYTE_SIZE );
+    }
+
+
+    /**
+     * Copies an array from the specified source array, beginning at the
+     * specified position, to the specified position of the destination array.
+     * A subsequence of array components are copied from the source
+     * array referenced by <code>src</code> to the destination array
+     * referenced by <code>dst</code>. The number of components copied is
+     * equal to the <code>length</code> argument. The components at
+     * positions <code>srcOffset</code> through
+     * <code>srcOffset+length-1</code> in the source array are copied into
+     * positions <code>dstOffset</code> through
+     * <code>dstOffset+length-1</code>, respectively, of the destination
+     * array.
+     * <p>
+     * If the <code>src</code> and <code>dst</code> arguments refer to the
+     * same array object, then the copying is performed as if the
+     * components at positions <code>srcOffset</code> through
+     * <code>srcOffset+length-1</code> were first copied to a temporary
+     * array with <code>length</code> components and then the contents of
+     * the temporary array were copied into positions
+     * <code>dstOffset</code> through <code>dstOffset+length-1</code> of the
+     * destination array.
+     * <p>
+     * If <code>dst</code> is <code>null</code>, then a
+     * <code>NullPointerException</code> is thrown.
+     * <p>
+     * If <code>src</code> is <code>null</code>, then a
+     * <code>NullPointerException</code> is thrown and the destination
+     * array is not modified.
+     * <p>
+     * Otherwise, if any of the following is true, an
+     * <code>ArrayStoreException</code> is thrown and the destination is
+     * not modified:
+     * <ul>
+     * <li>The <code>src</code> argument refers to an object that is not an
+     *     array.
+     * <li>The <code>dst</code> argument refers to an object that is not an
+     *     array.
+     * <li>The <code>src</code> argument and <code>dst</code> argument refer to
+     *     arrays whose component types are different primitive types.
+     * <li>The <code>src</code> argument refers to an array with a primitive
+     *     component type and the <code>dst</code> argument refers to an array
+     *     with a reference component type.
+     * <li>The <code>src</code> argument refers to an array with a reference
+     *     component type and the <code>dst</code> argument refers to an array
+     *     with a primitive component type.
+     * </ul>
+     * <p>
+     * Otherwise, if any of the following is true, an
+     * <code>IndexOutOfBoundsException</code> is
+     * thrown and the destination is not modified:
+     * <ul>
+     * <li>The <code>srcOffset</code> argument is negative.
+     * <li>The <code>dstOffset</code> argument is negative.
+     * <li>The <code>length</code> argument is negative.
+     * <li><code>srcOffset+length</code> is greater than
+     *     <code>src.length</code>, the length of the source array.
+     * <li><code>dstOffset+length</code> is greater than
+     *     <code>dst.length</code>, the length of the destination array.
+     * </ul>
+     * <p>
+     * Otherwise, if any actual component of the source array from
+     * position <code>srcOffset</code> through
+     * <code>srcOffset+length-1</code> cannot be converted to the component
+     * type of the destination array by assignment conversion, an
+     * <code>ArrayStoreException</code> is thrown. In this case, let
+     * <b><i>k</i></b> be the smallest nonnegative integer less than
+     * length such that <code>src[srcOffset+</code><i>k</i><code>]</code>
+     * cannot be converted to the component type of the destination
+     * array; when the exception is thrown, source array components from
+     * positions <code>srcOffset</code> through
+     * <code>srcOffset+</code><i>k</i><code>-1</code>
+     * will already have been copied to destination array positions
+     * <code>dstOffset</code> through
+     * <code>dstOffset+</code><i>k</I><code>-1</code> and no other
+     * positions of the destination array will have been modified.
+     * (Because of the restrictions already itemized, this
+     * paragraph effectively applies only to the situation where both
+     * arrays have component types that are reference types.)
+     *
+     * @param      src          the source array.
+     * @param      src_position start position in the source array.
+     * @param      dst          the destination array.
+     * @param      dst_position pos   start position in the destination data.
+     * @param      length       the number of array elements to be copied.
+     * @exception  IndexOutOfBoundsException  if copying would cause
+     *               access of data outside array bounds.
+     * @exception  ArrayStoreException  if an element in the <code>src</code>
+     *               array could not be stored into the <code>dest</code> array
+     *               because of a type mismatch.
+     * @exception  NullPointerException if either <code>src</code> or
+     *               <code>dst</code> is <code>null</code>.
+     */
+    private void arraycopy( byte[] src, int src_position,
+                            byte[] dst, int dst_position,
+                            int length )
+    {
+        System.arraycopy( src, src_position, dst, dst_position, length );
+    }
+
+    /**
+     * @return the unfinished string
+     */
+    String getUnfinishedString()
+    {
+        return unfinishedString;
+    }
+
+    /**
+     * @return true if current string uses wide characters
+     */
+    boolean isWideChar()
+    {
+        return wideChar;
+    }
+
+
+}
diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/src/java/org/apache/poi/hssf/record/SSTRecord.java
index d8428148a..734a90f6f 100644
--- a/src/java/org/apache/poi/hssf/record/SSTRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SSTRecord.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -59,7 +58,8 @@ import org.apache.poi.util.BinaryTree;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.LittleEndianConsts;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Title:        Static String Table Record
@@ -71,65 +71,45 @@ import java.util.*;
  * <P>
  * @author Andrew C. Oliver (acoliver at apache dot org)
  * @author Marc Johnson (mjohnson at apache dot org)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @version 2.0-pre
  * @see org.apache.poi.hssf.record.LabelSSTRecord
  * @see org.apache.poi.hssf.record.ContinueRecord
  */
 
 public class SSTRecord
-    extends Record
+        extends Record
 {
 
-    // how big can an SST record be? As big as any record can be: 8228
-    // bytes
-    private static final int  _max                     = 8228;
+    /** how big can an SST record be? As big as any record can be: 8228 bytes */
+    static final int MAX_RECORD_SIZE = 8228;
 
-    // standard record overhead: two shorts (record id plus data space
-    // size)
-    private static final int  _std_record_overhead     =
-        2 * LittleEndianConsts.SHORT_SIZE;
+    /** standard record overhead: two shorts (record id plus data space size)*/
+    static final int STD_RECORD_OVERHEAD =
+            2 * LittleEndianConsts.SHORT_SIZE;
 
-    // SST overhead: the standard record overhead, plus the number of
-    // strings and the number of unique strings -- two ints
-    private static final int  _sst_record_overhead     =
-        (_std_record_overhead + (2 * LittleEndianConsts.INT_SIZE));
+    /** SST overhead: the standard record overhead, plus the number of strings and the number of unique strings -- two ints */
+    static final int SST_RECORD_OVERHEAD =
+            ( STD_RECORD_OVERHEAD + ( 2 * LittleEndianConsts.INT_SIZE ) );
 
-    // how much data can we stuff into an SST record? That would be
-    // _max minus the standard SST record overhead
-    private static final int  _max_data_space          =
-        _max - _sst_record_overhead;
+    /** how much data can we stuff into an SST record? That would be _max minus the standard SST record overhead */
+    static final int MAX_DATA_SPACE = MAX_RECORD_SIZE - SST_RECORD_OVERHEAD;
 
-    // overhead for each string includes the string's character count
-    // (a short) and the flag describing its characteristics (a byte)
-    private static final int  _string_minimal_overhead =
-        LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.BYTE_SIZE;
-    public static final short sid                      = 0xfc;
+    /** overhead for each string includes the string's character count (a short) and the flag describing its characteristics (a byte) */
+    static final int STRING_MINIMAL_OVERHEAD = LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.BYTE_SIZE;
 
-    // union of strings in the SST and EXTSST
-    private int               field_1_num_strings;
+    public static final short sid = 0xfc;
 
-    // according to docs ONLY SST
-    private int               field_2_num_unique_strings;
-    private BinaryTree        field_3_strings;
+    /** union of strings in the SST and EXTSST */
+    private int field_1_num_strings;
 
-    // this is the number of characters we expect in the first
-    // sub-record in a subsequent continuation record
-    private int               __expected_chars;
+    /** according to docs ONLY SST */
+    private int field_2_num_unique_strings;
+    private BinaryTree field_3_strings;
 
-    // this is the string we were working on before hitting the end of
-    // the current record. This string is NOT finished.
-    private String            _unfinished_string;
-
-    // this is the total length of the current string being handled
-    private int               _total_length_bytes;
-
-    // this is the offset into a string field of the actual string
-    // data
-    private int               _string_data_offset;
-
-    // this is true if the string uses wide characters
-    private boolean           _wide_char;
-    private List              _record_lengths = null;
+    /** Record lengths for initial SST record and all continue records */
+    private List _record_lengths = null;
+    private SSTDeserializer deserializer;
 
     /**
      * default constructor
@@ -137,14 +117,10 @@ public class SSTRecord
 
     public SSTRecord()
     {
-        field_1_num_strings        = 0;
+        field_1_num_strings = 0;
         field_2_num_unique_strings = 0;
-        field_3_strings            = new BinaryTree();
-        setExpectedChars(0);
-        _unfinished_string  = "";
-        _total_length_bytes = 0;
-        _string_data_offset = 0;
-        _wide_char          = false;
+        field_3_strings = new BinaryTree();
+        deserializer = new SSTDeserializer(field_3_strings);
     }
 
     /**
@@ -156,9 +132,9 @@ public class SSTRecord
      * @param data of the record (should not contain sid/len)
      */
 
-    public SSTRecord(final short id, final short size, final byte [] data)
+    public SSTRecord( final short id, final short size, final byte[] data )
     {
-        super(id, size, data);
+        super( id, size, data );
     }
 
     /**
@@ -171,10 +147,10 @@ public class SSTRecord
      * @param offset of the record
      */
 
-    public SSTRecord(final short id, final short size, final byte [] data,
-                     int offset)
+    public SSTRecord( final short id, final short size, final byte[] data,
+                      int offset )
     {
-        super(id, size, data, offset);
+        super( id, size, data, offset );
     }
 
     /**
@@ -192,13 +168,13 @@ public class SSTRecord
      * @return the index of that string in the table
      */
 
-    public int addString(final String string)
+    public int addString( final String string )
     {
         int rval;
 
-        if (string == null)
+        if ( string == null )
         {
-            rval = addString("", false);
+            rval = addString( "", false );
         }
         else
         {
@@ -207,17 +183,17 @@ public class SSTRecord
             // present, we have to use 16-bit encoding. Otherwise, we
             // can use 8-bit encoding
             boolean useUTF16 = false;
-            int     strlen   = string.length();
+            int strlen = string.length();
 
-            for (int j = 0; j < strlen; j++)
+            for ( int j = 0; j < strlen; j++ )
             {
-                if (string.charAt(j) > 255)
+                if ( string.charAt( j ) > 255 )
                 {
                     useUTF16 = true;
                     break;
                 }
             }
-            rval = addString(string, useUTF16);
+            rval = addString( string, useUTF16 );
         }
         return rval;
     }
@@ -238,21 +214,21 @@ public class SSTRecord
      * @return the index of that string in the table
      */
 
-    public int addString(final String string, final boolean useUTF16)
+    public int addString( final String string, final boolean useUTF16 )
     {
         field_1_num_strings++;
-        String        str  = (string == null) ? ""
-                                              : string;
-        int           rval = -1;
-        UnicodeString ucs  = new UnicodeString();
+        String str = ( string == null ) ? ""
+                : string;
+        int rval = -1;
+        UnicodeString ucs = new UnicodeString();
 
-        ucs.setString(str);
-        ucs.setCharCount(( short ) str.length());
-        ucs.setOptionFlags(( byte ) (useUTF16 ? 1
-                                              : 0));
-        Integer integer = ( Integer ) field_3_strings.getKeyForValue(ucs);
+        ucs.setString( str );
+        ucs.setCharCount( (short) str.length() );
+        ucs.setOptionFlags( (byte) ( useUTF16 ? 1
+                : 0 ) );
+        Integer integer = (Integer) field_3_strings.getKeyForValue( ucs );
 
-        if (integer != null)
+        if ( integer != null )
         {
             rval = integer.intValue();
         }
@@ -263,8 +239,9 @@ public class SSTRecord
             // strings we've already collected
             rval = field_3_strings.size();
             field_2_num_unique_strings++;
-            integer = new Integer(rval);
-            field_3_strings.put(integer, ucs);
+            integer = new Integer( rval );
+            SSTDeserializer.addToStringTable( field_3_strings, integer, ucs );
+//            field_3_strings.put( integer, ucs );
         }
         return rval;
     }
@@ -298,7 +275,7 @@ public class SSTRecord
      *
      */
 
-    public void setNumStrings(final int count)
+    public void setNumStrings( final int count )
     {
         field_1_num_strings = count;
     }
@@ -314,7 +291,7 @@ public class SSTRecord
      * @param count  number of strings
      */
 
-    public void getNumUniqueStrings(final int count)
+    public void getNumUniqueStrings( final int count )
     {
         field_2_num_unique_strings = count;
     }
@@ -327,16 +304,15 @@ public class SSTRecord
      * @return the desired string
      */
 
-    public String getString(final int id)
+    public String getString( final int id )
     {
-        return (( UnicodeString ) field_3_strings.get(new Integer(id)))
-            .getString();
+        return ( (UnicodeString) field_3_strings.get( new Integer( id ) ) ).getString();
     }
 
-    public boolean getString16bit(final int id)
+    public boolean isString16bit( final int id )
     {
-        return ((( UnicodeString ) field_3_strings.get(new Integer(id)))
-            .getOptionFlags() == 1);
+        UnicodeString unicodeString = ( (UnicodeString) field_3_strings.get( new Integer( id ) ) );
+        return ( ( unicodeString.getOptionFlags() & 0x01 ) == 1 );
     }
 
     /**
@@ -349,326 +325,24 @@ public class SSTRecord
     {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append("[SST]\n");
-        buffer.append("    .numstrings     = ")
-            .append(Integer.toHexString(getNumStrings())).append("\n");
-        buffer.append("    .uniquestrings  = ")
-            .append(Integer.toHexString(getNumUniqueStrings())).append("\n");
-        for (int k = 0; k < field_3_strings.size(); k++)
+        buffer.append( "[SST]\n" );
+        buffer.append( "    .numstrings     = " )
+                .append( Integer.toHexString( getNumStrings() ) ).append( "\n" );
+        buffer.append( "    .uniquestrings  = " )
+                .append( Integer.toHexString( getNumUniqueStrings() ) ).append( "\n" );
+        for ( int k = 0; k < field_3_strings.size(); k++ )
         {
-            buffer.append("    .string_" + k + "      = ")
-                .append((( UnicodeString ) field_3_strings
-                .get(new Integer(k))).toString()).append("\n");
+            buffer.append( "    .string_" + k + "      = " )
+                    .append( ( (UnicodeString) field_3_strings
+                    .get( new Integer( k ) ) ).toString() ).append( "\n" );
         }
-        buffer.append("[/SST]\n");
+        buffer.append( "[/SST]\n" );
         return buffer.toString();
     }
 
-    /**
-     * Create a byte array consisting of an SST record and any
-     * required Continue records, ready to be written out.
-     * <p>
-     * If an SST record and any subsequent Continue records are read
-     * in to create this instance, this method should produce a byte
-     * array that is identical to the byte array produced by
-     * concatenating the input records' data.
-     *
-     * @return the byte array
-     */
-
-    public int serialize(int offset, byte [] data)
-    {
-        int rval                = getRecordSize();
-        int record_length_index = 0;
-
-        // get the linear size of that array
-        int unicodesize         = calculateUnicodeSize();
-
-        if (unicodesize > _max_data_space)
-        {
-            byte[]  stringreminant     = null;
-            int     unipos             = 0;
-            boolean lastneedcontinue   = false;
-            int     stringbyteswritten = 0;
-            boolean first_record       = true;
-            int     totalWritten       = 0;
-            int     size               = 0;
-
-            while (totalWritten != rval)
-            {
-                int pos = 0;
-
-                // write the appropriate header
-                int available;
-
-                if (first_record)
-                {
-                    size         =
-                        (( Integer ) _record_lengths
-                            .get(record_length_index++)).intValue();
-                    available    = size - 8;
-                    pos          = writeSSTHeader(data,
-                                                  pos + offset
-                                                  + totalWritten, size);
-                    size         += _std_record_overhead;
-                    first_record = false;
-                }
-                else
-                {
-                    pos = 0;
-                    int to_be_written = (unicodesize - stringbyteswritten)
-                                        + (lastneedcontinue ? 1
-                                                            : 0);           // not used?
-
-                    size      =
-                        (( Integer ) _record_lengths
-                            .get(record_length_index++)).intValue();
-                    available = size;
-                    pos       = writeContinueHeader(data,
-                                                    pos + offset
-                                                    + totalWritten, size);
-                    size      = size + _std_record_overhead;
-                }
-
-                // now, write the rest of the data into the current
-                // record space
-                if (lastneedcontinue)
-                {
-
-                    // the last string in the previous record was not
-                    // written out completely
-                    if (stringreminant.length <= available)
-                    {
-
-                        // write reminant -- it'll all fit neatly
-                        System.arraycopy(stringreminant, 0, data,
-                                         pos + offset + totalWritten,
-                                         stringreminant.length);
-                        stringbyteswritten += stringreminant.length - 1;
-                        pos                += stringreminant.length;
-                        lastneedcontinue   = false;
-                        available          -= stringreminant.length;
-                    }
-                    else
-                    {
-
-                        // write as much of the remnant as possible
-                        System.arraycopy(stringreminant, 0, data,
-                                         pos + offset + totalWritten,
-                                         available);
-                        stringbyteswritten += available - 1;
-                        pos                += available;
-                        byte[] leftover =
-                            new byte[ (stringreminant.length - available) + LittleEndianConsts.BYTE_SIZE ];
-
-                        System.arraycopy(stringreminant, available, leftover,
-                                         LittleEndianConsts.BYTE_SIZE,
-                                         stringreminant.length - available);
-                        leftover[ 0 ]    = stringreminant[ 0 ];
-                        stringreminant   = leftover;
-                        available        = 0;
-                        lastneedcontinue = true;
-                    }
-                }
-
-                // last string's remnant, if any, is cleaned up as
-                // best as can be done ... now let's try and write
-                // some more strings
-                for (; unipos < field_3_strings.size(); unipos++)
-                {
-                    Integer       intunipos = new Integer(unipos);
-                    UnicodeString unistr    =
-                        (( UnicodeString ) field_3_strings.get(intunipos));
-
-                    if (unistr.getRecordSize() <= available)
-                    {
-                        unistr.serialize(pos + offset + totalWritten, data);
-                        int rsize = unistr.getRecordSize();
-
-                        stringbyteswritten += rsize;
-                        pos                += rsize;
-                        available          -= rsize;
-                    }
-                    else
-                    {
-
-                        // can't write the entire string out
-                        if (available >= _string_minimal_overhead)
-                        {
-
-                            // we can write some of it
-                            byte[] ucs = unistr.serialize();
-
-                            System.arraycopy(ucs, 0, data,
-                                             pos + offset + totalWritten,
-                                             available);
-                            stringbyteswritten += available;
-                            stringreminant     =
-                                new byte[ (ucs.length - available) + LittleEndianConsts.BYTE_SIZE ];
-                            System.arraycopy(ucs, available, stringreminant,
-                                             LittleEndianConsts.BYTE_SIZE,
-                                             ucs.length - available);
-                            stringreminant[ 0 ] =
-                                ucs[ LittleEndianConsts.SHORT_SIZE ];
-                            available           = 0;
-                            lastneedcontinue    = true;
-                            unipos++;
-                        }
-                        break;
-                    }
-                }
-                totalWritten += size;
-            }
-        }
-        else
-        {
-
-            // short data: write one simple SST record
-            int datasize = _sst_record_overhead + unicodesize;           // not used?
-
-            writeSSTHeader(
-                data, 0 + offset,
-                _sst_record_overhead
-                + (( Integer ) _record_lengths.get(
-                record_length_index++)).intValue() - _std_record_overhead);
-            int pos = _sst_record_overhead;
-
-            for (int k = 0; k < field_3_strings.size(); k++)
-            {
-                UnicodeString unistr =
-                    (( UnicodeString ) field_3_strings.get(new Integer(k)));
-
-                System.arraycopy(unistr.serialize(), 0, data, pos + offset,
-                                 unistr.getRecordSize());
-                pos += unistr.getRecordSize();
-            }
-        }
-        return rval;
-    }
-
-    // not used: remove?
-    private int calculateStringsize()
-    {
-        int retval = 0;
-
-        for (int k = 0; k < field_3_strings.size(); k++)
-        {
-            retval +=
-                (( UnicodeString ) field_3_strings.get(new Integer(k)))
-                    .getRecordSize();
-        }
-        return retval;
-    }
-
-    /**
-     * Process a Continue record. A Continue record for an SST record
-     * contains the same kind of data that the SST record contains,
-     * with the following exceptions:
-     * <P>
-     * <OL>
-     * <LI>The string counts at the beginning of the SST record are
-     *     not in the Continue record
-     * <LI>The first string in the Continue record might NOT begin
-     *     with a size. If the last string in the previous record is
-     *     continued in this record, the size is determined by that
-     *     last string in the previous record; the first string will
-     *     begin with a flag byte, followed by the remaining bytes (or
-     *     words) of the last string from the previous
-     *     record. Otherwise, the first string in the record will
-     *     begin with a string length
-     * </OL>
-     *
-     * @param record the Continue record's byte data
-     */
-
-    public void processContinueRecord(final byte [] record)
-    {
-        if (getExpectedChars() == 0)
-        {
-            _unfinished_string  = "";
-            _total_length_bytes = 0;
-            _string_data_offset = 0;
-            _wide_char          = false;
-            manufactureStrings(record, 0, ( short ) record.length);
-        }
-        else
-        {
-            int data_length = record.length - LittleEndianConsts.BYTE_SIZE;
-
-            if (calculateByteCount(getExpectedChars()) > data_length)
-            {
-
-                // create artificial data to create a UnicodeString
-                byte[] input =
-                    new byte[ record.length + LittleEndianConsts.SHORT_SIZE ];
-                short  size  = ( short ) (((record[ 0 ] & 1) == 1)
-                                          ? (data_length
-                                             / LittleEndianConsts.SHORT_SIZE)
-                                          : (data_length
-                                             / LittleEndianConsts.BYTE_SIZE));
-
-                LittleEndian.putShort(input, ( byte ) 0, size);
-                System.arraycopy(record, 0, input,
-                                 LittleEndianConsts.SHORT_SIZE,
-                                 record.length);
-                UnicodeString ucs = new UnicodeString(UnicodeString.sid,
-                                                      ( short ) input.length,
-                                                      input);
-
-                _unfinished_string = _unfinished_string + ucs.getString();
-                setExpectedChars(getExpectedChars() - size);
-            }
-            else
-            {
-                setupStringParameters(record, -LittleEndianConsts.SHORT_SIZE,
-                                      getExpectedChars());
-                byte[] str_data = new byte[ _total_length_bytes ];
-                int    length   = _string_minimal_overhead
-                                  + (calculateByteCount(getExpectedChars()));
-                byte[] bstring  = new byte[ length ];
-
-                // Copy data from the record into the string
-                // buffer. Copy skips the length of a short in the
-                // string buffer, to leave room for the string length.
-                System.arraycopy(record, 0, str_data,
-                                 LittleEndianConsts.SHORT_SIZE,
-                                 str_data.length
-                                 - LittleEndianConsts.SHORT_SIZE);
-
-                // write the string length
-                LittleEndian.putShort(bstring, 0,
-                                      ( short ) getExpectedChars());
-
-                // write the options flag
-                bstring[ LittleEndianConsts.SHORT_SIZE ] =
-                    str_data[ LittleEndianConsts.SHORT_SIZE ];
-
-                // copy the bytes/words making up the string; skipping
-                // past all the overhead of the str_data array
-                System.arraycopy(str_data, _string_data_offset, bstring,
-                                 _string_minimal_overhead,
-                                 bstring.length - _string_minimal_overhead);
-
-                // use special constructor to create the final string
-                UnicodeString string  =
-                    new UnicodeString(UnicodeString.sid,
-                                      ( short ) bstring.length, bstring,
-                                      _unfinished_string);
-                Integer       integer = new Integer(field_3_strings.size());
-
-                field_3_strings.put(integer, string);
-                manufactureStrings(record,
-                                   _total_length_bytes
-                                   - LittleEndianConsts
-                                       .SHORT_SIZE, ( short ) record.length);
-            }
-        }
-    }
-
     /**
      * @return sid
      */
-
     public short getSid()
     {
         return sid;
@@ -677,30 +351,23 @@ public class SSTRecord
     /**
      * @return hashcode
      */
-
     public int hashCode()
     {
         return field_2_num_unique_strings;
     }
 
-    /**
-     *
-     * @param o
-     * @return true if equal
-     */
-
-    public boolean equals(Object o)
+    public boolean equals( Object o )
     {
-        if ((o == null) || (o.getClass() != this.getClass()))
+        if ( ( o == null ) || ( o.getClass() != this.getClass() ) )
         {
             return false;
         }
-        SSTRecord other = ( SSTRecord ) o;
+        SSTRecord other = (SSTRecord) o;
 
-        return ((field_1_num_strings == other
-            .field_1_num_strings) && (field_2_num_unique_strings == other
-                .field_2_num_unique_strings) && field_3_strings
-                    .equals(other.field_3_strings));
+        return ( ( field_1_num_strings == other
+                .field_1_num_strings ) && ( field_2_num_unique_strings == other
+                .field_2_num_unique_strings ) && field_3_strings
+                .equals( other.field_3_strings ) );
     }
 
     /**
@@ -711,12 +378,12 @@ public class SSTRecord
      * @exception RecordFormatException if validation fails
      */
 
-    protected void validateSid(final short id)
-        throws RecordFormatException
+    protected void validateSid( final short id )
+            throws RecordFormatException
     {
-        if (id != sid)
+        if ( id != sid )
         {
-            throw new RecordFormatException("NOT An SST RECORD");
+            throw new RecordFormatException( "NOT An SST RECORD" );
         }
     }
 
@@ -800,33 +467,20 @@ public class SSTRecord
      * @param size size of the raw data
      */
 
-    protected void fillFields(final byte [] data, final short size,
-                              int offset)
+    protected void fillFields( final byte[] data, final short size,
+                               int offset )
     {
 
         // this method is ALWAYS called after construction -- using
         // the nontrivial constructor, of course -- so this is where
         // we initialize our fields
-        field_1_num_strings        = LittleEndian.getInt(data, 0 + offset);
-        field_2_num_unique_strings = LittleEndian.getInt(data, 4 + offset);
-        field_3_strings            = new BinaryTree();
-        setExpectedChars(0);
-        _unfinished_string  = "";
-        _total_length_bytes = 0;
-        _string_data_offset = 0;
-        _wide_char          = false;
-        manufactureStrings(data, 8 + offset, size);
+        field_1_num_strings = LittleEndian.getInt( data, 0 + offset );
+        field_2_num_unique_strings = LittleEndian.getInt( data, 4 + offset );
+        field_3_strings = new BinaryTree();
+        deserializer = new SSTDeserializer(field_3_strings);
+        deserializer.manufactureStrings( data, 8 + offset, (short)(size - 8) );
     }
 
-    /**
-     * @return the number of characters we expect in the first
-     *         sub-record in a subsequent continuation record
-     */
-
-    int getExpectedChars()
-    {
-        return __expected_chars;
-    }
 
     /**
      * @return an iterator of the strings we hold. All instances are
@@ -848,372 +502,43 @@ public class SSTRecord
     }
 
     /**
-     * @return the unfinished string
+     * called by the class that is responsible for writing this sucker.
+     * Subclasses should implement this so that their data is passed back in a
+     * byte array.
+     *
+     * @return byte array containing instance data
      */
 
-    String getUnfinishedString()
+    public int serialize( int offset, byte[] data )
     {
-        return _unfinished_string;
+        SSTSerializer serializer = new SSTSerializer(
+                _record_lengths, field_3_strings, getNumStrings(), getNumUniqueStrings() );
+        return serializer.serialize( offset, data );
     }
 
-    /**
-     * @return the total length of the current string
-     */
-
-    int getTotalLength()
-    {
-        return _total_length_bytes;
-    }
-
-    /**
-     * @return offset into current string data
-     */
-
-    int getStringDataOffset()
-    {
-        return _string_data_offset;
-    }
-
-    /**
-     * @return true if current string uses wide characters
-     */
-
-    boolean isWideChar()
-    {
-        return _wide_char;
-    }
-
-    private int writeSSTHeader(final byte [] data, final int pos,
-                               final int recsize)
-    {
-        int offset = pos;
-
-        LittleEndian.putShort(data, offset, sid);
-        offset += LittleEndianConsts.SHORT_SIZE;
-        LittleEndian.putShort(data, offset, ( short ) (recsize));
-        offset += LittleEndianConsts.SHORT_SIZE;
-        LittleEndian.putInt(data, offset, getNumStrings());
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(data, offset, getNumUniqueStrings());
-        offset += LittleEndianConsts.INT_SIZE;
-        return offset - pos;
-    }
-
-    private int writeContinueHeader(final byte [] data, final int pos,
-                                    final int recsize)
-    {
-        int offset = pos;
-
-        LittleEndian.putShort(data, offset, ContinueRecord.sid);
-        offset += LittleEndianConsts.SHORT_SIZE;
-        LittleEndian.putShort(data, offset, ( short ) (recsize));
-        offset += LittleEndianConsts.SHORT_SIZE;
-        return offset - pos;
-    }
-
-    private int calculateUCArrayLength(final byte [][] ucarray)
-    {
-        int retval = 0;
-
-        for (int k = 0; k < ucarray.length; k++)
-        {
-            retval += ucarray[ k ].length;
-        }
-        return retval;
-    }
-
-    private void manufactureStrings(final byte [] data, final int index,
-                                    short size)
-    {
-        int offset = index;
-
-        while (offset < size)
-        {
-            int remaining = size - offset;
-
-            if ((remaining > 0)
-                    && (remaining < LittleEndianConsts.SHORT_SIZE))
-            {
-                throw new RecordFormatException(
-                    "Cannot get length of the last string in SSTRecord");
-            }
-            if (remaining == LittleEndianConsts.SHORT_SIZE)
-            {
-                setExpectedChars(LittleEndian.getShort(data, offset));
-                _unfinished_string = "";
-                break;
-            }
-            short char_count = LittleEndian.getShort(data, offset);
-
-            setupStringParameters(data, offset, char_count);
-            if (remaining < _total_length_bytes)
-            {
-                setExpectedChars(calculateCharCount(_total_length_bytes
-                                                    - remaining));
-                char_count          -= getExpectedChars();
-                _total_length_bytes = remaining;
-            }
-            else
-            {
-                setExpectedChars(0);
-            }
-            processString(data, offset, char_count);
-            offset += _total_length_bytes;
-            if (getExpectedChars() != 0)
-            {
-                break;
-            }
-        }
-    }
-
-    private void setupStringParameters(final byte [] data, final int index,
-                                       final int char_count)
-    {
-        byte flag = data[ index + LittleEndianConsts.SHORT_SIZE ];
-
-        _wide_char = (flag & 1) == 1;
-        boolean extended      = (flag & 4) == 4;
-        boolean formatted_run = (flag & 8) == 8;
-
-        _total_length_bytes = _string_minimal_overhead
-                              + calculateByteCount(char_count);
-        _string_data_offset = _string_minimal_overhead;
-        if (formatted_run)
-        {
-            short run_count = LittleEndian.getShort(data,
-                                                    index
-                                                    + _string_data_offset);
-
-            _string_data_offset += LittleEndianConsts.SHORT_SIZE;
-            _total_length_bytes += LittleEndianConsts.SHORT_SIZE
-                                   + (LittleEndianConsts.INT_SIZE
-                                      * run_count);
-        }
-        if (extended)
-        {
-            int extension_length = LittleEndian.getInt(data,
-                                                       index
-                                                       + _string_data_offset);
-
-            _string_data_offset += LittleEndianConsts.INT_SIZE;
-            _total_length_bytes += LittleEndianConsts.INT_SIZE
-                                   + extension_length;
-        }
-    }
-
-    private void processString(final byte [] data, final int index,
-                               final short char_count)
-    {
-        byte[] str_data = new byte[ _total_length_bytes ];
-        int    length   = _string_minimal_overhead
-                          + calculateByteCount(char_count);
-        byte[] bstring  = new byte[ length ];
-
-        System.arraycopy(data, index, str_data, 0, str_data.length);
-        int offset = 0;
-
-        LittleEndian.putShort(bstring, offset, char_count);
-        offset            += LittleEndianConsts.SHORT_SIZE;
-        bstring[ offset ] = str_data[ offset ];
-        System.arraycopy(str_data, _string_data_offset, bstring,
-                         _string_minimal_overhead,
-                         bstring.length - _string_minimal_overhead);
-        UnicodeString string = new UnicodeString(UnicodeString.sid,
-                                                 ( short ) bstring.length,
-                                                 bstring);
-
-        if (getExpectedChars() != 0)
-        {
-            _unfinished_string = string.getString();
-        }
-        else
-        {
-            Integer integer = new Integer(field_3_strings.size());
-
-            field_3_strings.put(integer, string);
-        }
-    }
-
-    private void setExpectedChars(final int count)
-    {
-        __expected_chars = count;
-    }
-
-    private int calculateByteCount(final int character_count)
-    {
-        return character_count * (_wide_char ? LittleEndianConsts.SHORT_SIZE
-                                             : LittleEndianConsts.BYTE_SIZE);
-    }
-
-    private int calculateCharCount(final int byte_count)
-    {
-        return byte_count / (_wide_char ? LittleEndianConsts.SHORT_SIZE
-                                        : LittleEndianConsts.BYTE_SIZE);
-    }
 
     // we can probably simplify this later...this calculates the size
     // w/o serializing but still is a bit slow
     public int getRecordSize()
     {
-        _record_lengths = new ArrayList();
-        int retval      = 0;
-        int unicodesize = calculateUnicodeSize();
+        SSTSerializer serializer = new SSTSerializer(
+                _record_lengths, field_3_strings, getNumStrings(), getNumUniqueStrings() );
 
-        if (unicodesize > _max_data_space)
-        {
-            UnicodeString unistr             = null;
-            int           stringreminant     = 0;
-            int           unipos             = 0;
-            boolean       lastneedcontinue   = false;
-            int           stringbyteswritten = 0;
-            boolean       finished           = false;
-            boolean       first_record       = true;
-            int           totalWritten       = 0;
-
-            while (!finished)
-            {
-                int record = 0;
-                int pos    = 0;
-
-                if (first_record)
-                {
-
-                    // writing SST record
-                    record       = _max;
-                    pos          = 12;
-                    first_record = false;
-                    _record_lengths.add(new Integer(record
-                                                    - _std_record_overhead));
-                }
-                else
-                {
-
-                    // writing continue record
-                    pos = 0;
-                    int to_be_written = (unicodesize - stringbyteswritten)
-                                        + (lastneedcontinue ? 1
-                                                            : 0);
-                    int size          = Math.min(_max - _std_record_overhead,
-                                                 to_be_written);
-
-                    if (size == to_be_written)
-                    {
-                        finished = true;
-                    }
-                    record = size + _std_record_overhead;
-                    _record_lengths.add(new Integer(size));
-                    pos = 4;
-                }
-                if (lastneedcontinue)
-                {
-                    int available = _max - pos;
-
-                    if (stringreminant <= available)
-                    {
-
-                        // write reminant
-                        stringbyteswritten += stringreminant - 1;
-                        pos                += stringreminant;
-                        lastneedcontinue   = false;
-                    }
-                    else
-                    {
-
-                        // write as much of the remnant as possible
-                        int toBeWritten = unistr.maxBrokenLength(available);
-
-                        if (available != toBeWritten)
-                        {
-                            int shortrecord = record
-                                              - (available - toBeWritten);
-
-                            _record_lengths.set(
-                                _record_lengths.size() - 1,
-                                new Integer(
-                                    shortrecord - _std_record_overhead));
-                            record = shortrecord;
-                        }
-                        stringbyteswritten += toBeWritten - 1;
-                        pos                += toBeWritten;
-                        stringreminant     -= toBeWritten - 1;
-                        lastneedcontinue   = true;
-                    }
-                }
-                for (; unipos < field_3_strings.size(); unipos++)
-                {
-                    int     available = _max - pos;
-                    Integer intunipos = new Integer(unipos);
-
-                    unistr =
-                        (( UnicodeString ) field_3_strings.get(intunipos));
-                    if (unistr.getRecordSize() <= available)
-                    {
-                        stringbyteswritten += unistr.getRecordSize();
-                        pos                += unistr.getRecordSize();
-                    }
-                    else
-                    {
-                        if (available >= _string_minimal_overhead)
-                        {
-                            int toBeWritten =
-                                unistr.maxBrokenLength(available);
-
-                            stringbyteswritten += toBeWritten;
-                            stringreminant     =
-                                (unistr.getRecordSize() - toBeWritten)
-                                + LittleEndianConsts.BYTE_SIZE;
-                            if (available != toBeWritten)
-                            {
-                                int shortrecord = record
-                                                  - (available - toBeWritten);
-
-                                _record_lengths.set(
-                                    _record_lengths.size() - 1,
-                                    new Integer(
-                                        shortrecord - _std_record_overhead));
-                                record = shortrecord;
-                            }
-                            lastneedcontinue = true;
-                            unipos++;
-                        }
-                        else
-                        {
-                            int shortrecord = record - available;
-
-                            _record_lengths.set(
-                                _record_lengths.size() - 1,
-                                new Integer(
-                                    shortrecord - _std_record_overhead));
-                            record = shortrecord;
-                        }
-                        break;
-                    }
-                }
-                totalWritten += record;
-            }
-            retval = totalWritten;
-        }
-        else
-        {
-
-            // short data: write one simple SST record
-            retval = _sst_record_overhead + unicodesize;
-            _record_lengths.add(new Integer(unicodesize));
-        }
-        return retval;
+        return serializer.getRecordSize();
     }
 
-    private int calculateUnicodeSize()
+    SSTDeserializer getDeserializer()
     {
-        int retval = 0;
+        return deserializer;
+    }
 
-        for (int k = 0; k < field_3_strings.size(); k++)
-        {
-            UnicodeString string =
-                ( UnicodeString ) field_3_strings.get(new Integer(k));
-
-            retval += string.getRecordSize();
-        }
-        return retval;
+    /**
+     * Strange to handle continue records this way.  Is it a smell?
+     */
+    public void processContinueRecord( byte[] record )
+    {
+        deserializer.processContinueRecord( record );
     }
 }
+
+
diff --git a/src/java/org/apache/poi/hssf/record/SSTSerializer.java b/src/java/org/apache/poi/hssf/record/SSTSerializer.java
new file mode 100644
index 000000000..580227914
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/SSTSerializer.java
@@ -0,0 +1,356 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache POI" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache POI", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.poi.hssf.record;
+
+import org.apache.poi.util.BinaryTree;
+import org.apache.poi.util.LittleEndianConsts;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * This class handles serialization of SST records.  It utilizes the record processor
+ * class write individual records. This has been refactored from the SSTRecord class.
+ *
+ * @author Glen Stampoultzis (glens at apache.org)
+ */
+class SSTSerializer
+{
+
+    private List recordLengths;
+    private BinaryTree strings;
+    private int numStrings;
+    private int numUniqueStrings;
+    private SSTRecordHeader sstRecordHeader;
+
+    public SSTSerializer( List recordLengths, BinaryTree strings, int numStrings, int numUniqueStrings )
+    {
+        this.recordLengths = recordLengths;
+        this.strings = strings;
+        this.numStrings = numStrings;
+        this.numUniqueStrings = numUniqueStrings;
+        this.sstRecordHeader = new SSTRecordHeader(numStrings, numUniqueStrings);
+    }
+
+    /**
+     * Create a byte array consisting of an SST record and any
+     * required Continue records, ready to be written out.
+     * <p>
+     * If an SST record and any subsequent Continue records are read
+     * in to create this instance, this method should produce a byte
+     * array that is identical to the byte array produced by
+     * concatenating the input records' data.
+     *
+     * @return the byte array
+     */
+    public int serialize( int offset, byte[] data )
+    {
+        int record_size = getRecordSize();
+        int record_length_index = 0;
+
+        if ( calculateUnicodeSize() > SSTRecord.MAX_DATA_SPACE )
+            serializeLargeRecord( record_size, record_length_index, data, offset );
+        else
+            serializeSingleSSTRecord( data, offset, record_length_index );
+        return record_size;
+    }
+
+    private int calculateUnicodeSize()
+    {
+        int retval = 0;
+
+        for ( int k = 0; k < strings.size(); k++ )
+        {
+            retval += getUnicodeString(k).getRecordSize();
+        }
+        return retval;
+    }
+
+    // we can probably simplify this later...this calculates the size
+    // w/o serializing but still is a bit slow
+    public int getRecordSize()
+    {
+        recordLengths = new ArrayList();
+        int retval = 0;
+        int unicodesize = calculateUnicodeSize();
+
+        if ( unicodesize > SSTRecord.MAX_DATA_SPACE )
+        {
+            retval = calcRecordSizesForLongStrings( unicodesize );
+        }
+        else
+        {
+            // short data: write one simple SST record
+            retval = SSTRecord.SST_RECORD_OVERHEAD + unicodesize;
+            recordLengths.add( new Integer( unicodesize ) );
+        }
+        return retval;
+    }
+
+    private int calcRecordSizesForLongStrings( int unicodesize )
+    {
+        int retval;
+        UnicodeString unistr = null;
+        int stringreminant = 0;
+        int unipos = 0;
+        boolean lastneedcontinue = false;
+        int stringbyteswritten = 0;
+        boolean finished = false;
+        boolean first_record = true;
+        int totalWritten = 0;
+
+        while ( !finished )
+        {
+            int record = 0;
+            int pos = 0;
+
+            if ( first_record )
+            {
+
+                // writing SST record
+                record = SSTRecord.MAX_RECORD_SIZE;
+                pos = 12;
+                first_record = false;
+                recordLengths.add( new Integer( record - SSTRecord.STD_RECORD_OVERHEAD ) );
+            }
+            else
+            {
+
+                // writing continue record
+                pos = 0;
+                int to_be_written = ( unicodesize - stringbyteswritten ) + ( lastneedcontinue ? 1 : 0 );
+                int size = Math.min( SSTRecord.MAX_RECORD_SIZE - SSTRecord.STD_RECORD_OVERHEAD, to_be_written );
+
+                if ( size == to_be_written )
+                {
+                    finished = true;
+                }
+                record = size + SSTRecord.STD_RECORD_OVERHEAD;
+                recordLengths.add( new Integer( size ) );
+                pos = 4;
+            }
+            if ( lastneedcontinue )
+            {
+                int available = SSTRecord.MAX_RECORD_SIZE - pos;
+
+                if ( stringreminant <= available )
+                {
+
+                    // write reminant
+                    stringbyteswritten += stringreminant - 1;
+                    pos += stringreminant;
+                    lastneedcontinue = false;
+                }
+                else
+                {
+
+                    // write as much of the remnant as possible
+                    int toBeWritten = unistr.maxBrokenLength( available );
+
+                    if ( available != toBeWritten )
+                    {
+                        int shortrecord = record - ( available - toBeWritten );
+                        recordLengths.set( recordLengths.size() - 1,
+                                new Integer( shortrecord - SSTRecord.STD_RECORD_OVERHEAD ) );
+                        record = shortrecord;
+                    }
+                    stringbyteswritten += toBeWritten - 1;
+                    pos += toBeWritten;
+                    stringreminant -= toBeWritten - 1;
+                    lastneedcontinue = true;
+                }
+            }
+            for ( ; unipos < strings.size(); unipos++ )
+            {
+                int available = SSTRecord.MAX_RECORD_SIZE - pos;
+                Integer intunipos = new Integer( unipos );
+
+                unistr = ( (UnicodeString) strings.get( intunipos ) );
+                if ( unistr.getRecordSize() <= available )
+                {
+                    stringbyteswritten += unistr.getRecordSize();
+                    pos += unistr.getRecordSize();
+                }
+                else
+                {
+                    if ( available >= SSTRecord.STRING_MINIMAL_OVERHEAD )
+                    {
+                        int toBeWritten =
+                                unistr.maxBrokenLength( available );
+
+                        stringbyteswritten += toBeWritten;
+                        stringreminant =
+                                ( unistr.getRecordSize() - toBeWritten )
+                                + LittleEndianConsts.BYTE_SIZE;
+                        if ( available != toBeWritten )
+                        {
+                            int shortrecord = record
+                                    - ( available - toBeWritten );
+
+                            recordLengths.set(
+                                    recordLengths.size() - 1,
+                                    new Integer(
+                                            shortrecord - SSTRecord.STD_RECORD_OVERHEAD ) );
+                            record = shortrecord;
+                        }
+                        lastneedcontinue = true;
+                        unipos++;
+                    }
+                    else
+                    {
+                        int shortrecord = record - available;
+
+                        recordLengths.set( recordLengths.size() - 1,
+                                new Integer( shortrecord - SSTRecord.STD_RECORD_OVERHEAD ) );
+                        record = shortrecord;
+                    }
+                    break;
+                }
+            }
+            totalWritten += record;
+        }
+        retval = totalWritten;
+
+        return retval;
+    }
+
+
+    private void serializeSingleSSTRecord( byte[] data, int offset, int record_length_index )
+    {
+        // short data: write one simple SST record
+
+        int len = ( (Integer) recordLengths.get( record_length_index++ ) ).intValue();
+        int recordSize = SSTRecord.SST_RECORD_OVERHEAD + len - SSTRecord.STD_RECORD_OVERHEAD;
+        sstRecordHeader.writeSSTHeader( data, 0 + offset, recordSize );
+        int pos = SSTRecord.SST_RECORD_OVERHEAD;
+
+        for ( int k = 0; k < strings.size(); k++ )
+        {
+//            UnicodeString unistr = ( (UnicodeString) strings.get( new Integer( k ) ) );
+            System.arraycopy( getUnicodeString(k).serialize(), 0, data, pos + offset, getUnicodeString(k).getRecordSize() );
+            pos += getUnicodeString(k).getRecordSize();
+        }
+    }
+
+    /**
+     * Large records are serialized to an SST and to one or more CONTINUE records.  Joy.  They have the special
+     * characteristic that they can change the option field when a single string is split across to a
+     * CONTINUE record.
+     */
+    private void serializeLargeRecord( int record_size, int record_length_index, byte[] buffer, int offset )
+    {
+
+        byte[] stringReminant = null;
+        int stringIndex = 0;
+        boolean lastneedcontinue = false;
+        boolean first_record = true;
+        int totalWritten = 0;
+
+        while ( totalWritten != record_size )
+        {
+            int recordLength = ( (Integer) recordLengths.get( record_length_index++ ) ).intValue();
+            RecordProcessor recordProcessor = new RecordProcessor( buffer,
+                    recordLength, numStrings, numUniqueStrings );
+
+            // write the appropriate header
+            recordProcessor.writeRecordHeader( offset, totalWritten, recordLength, first_record );
+            first_record = false;
+
+            // now, write the rest of the data into the current
+            // record space
+            if ( lastneedcontinue )
+            {
+                lastneedcontinue = stringReminant.length > recordProcessor.getAvailable();
+                // the last string in the previous record was not written out completely
+                stringReminant = recordProcessor.writeStringRemainder( lastneedcontinue,
+                        stringReminant, offset, totalWritten );
+            }
+
+            // last string's remnant, if any, is cleaned up as best as can be done ... now let's try and write
+            // some more strings
+            for ( ; stringIndex < strings.size(); stringIndex++ )
+            {
+                UnicodeString unistr = getUnicodeString( stringIndex );
+
+                if ( unistr.getRecordSize() <= recordProcessor.getAvailable() )
+                {
+                    recordProcessor.writeWholeString( unistr, offset, totalWritten );
+                }
+                else
+                {
+
+                    // can't write the entire string out
+                    if ( recordProcessor.getAvailable() >= SSTRecord.STRING_MINIMAL_OVERHEAD )
+                    {
+
+                        // we can write some of it
+                        stringReminant = recordProcessor.writePartString( unistr, offset, totalWritten );
+                        lastneedcontinue = true;
+                        stringIndex++;
+                    }
+                    break;
+                }
+            }
+            totalWritten += recordLength + SSTRecord.STD_RECORD_OVERHEAD;
+        }
+    }
+
+    private UnicodeString getUnicodeString( int index )
+    {
+        Integer intunipos = new Integer( index );
+        return ( (UnicodeString) strings.get( intunipos ) );
+    }
+
+}
diff --git a/src/java/org/apache/poi/hssf/record/UnicodeString.java b/src/java/org/apache/poi/hssf/record/UnicodeString.java
index 097be19b1..d56b660d4 100644
--- a/src/java/org/apache/poi/hssf/record/UnicodeString.java
+++ b/src/java/org/apache/poi/hssf/record/UnicodeString.java
@@ -66,6 +66,7 @@ import org.apache.poi.util.StringUtil;
  * REFERENCE:  PG 264 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  * @author  Andrew C. Oliver
  * @author Marc Johnson (mjohnson at apache dot org)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @version 2.0-pre
  */
 
@@ -77,12 +78,29 @@ public class UnicodeString
     private short             field_1_charCount;     // = 0;
     private byte              field_2_optionflags;   // = 0;
     private String            field_3_string;        // = null;
+    private final int RICH_TEXT_BIT = 8;
+    private final int EXT_BIT = 4;
+
+    public UnicodeString()
+    {
+    }
+
 
     public int hashCode()
     {
-        return field_1_charCount;
+        int stringHash = 0;
+        if (field_3_string != null)
+            stringHash = field_3_string.hashCode();
+        return field_1_charCount + stringHash;
     }
 
+    /**
+     * Our handling of equals is inconsistent with compareTo.  The trouble is because we don't truely understand
+     * rich text fields yet it's difficult to make a sound comparison.
+     *
+     * @param o     The object to compare.
+     * @return      true if the object is actually equal.
+     */
     public boolean equals(Object o)
     {
         if ((o == null) || (o.getClass() != this.getClass()))
@@ -96,10 +114,6 @@ public class UnicodeString
                 && field_3_string.equals(other.field_3_string));
     }
 
-    public UnicodeString()
-    {
-    }
-
     /**
      * construct a unicode string record and fill its fields, ID is ignored
      * @param id - ignored
@@ -278,19 +292,10 @@ public class UnicodeString
 
     public int serialize(int offset, byte [] data)
     {
-        int charsize = 1;
-
-        if (getOptionFlags() == 1)
-        {
-            charsize = 2;
-        }
-
-        // byte[] retval = new byte[ 3 + (getString().length() * charsize) ];
         LittleEndian.putShort(data, 0 + offset, getCharCount());
         data[ 2 + offset ] = getOptionFlags();
 
-//        System.out.println("Unicode: We've got "+retval[2]+" for our option flag");
-        if (getOptionFlags() == 0)
+        if (!isUncompressedUnicode())
         {
             StringUtil.putCompressedUnicode(getString(), data, 0x3 + offset);
         }
@@ -302,14 +307,14 @@ public class UnicodeString
         return getRecordSize();
     }
 
+    private boolean isUncompressedUnicode()
+    {
+        return (getOptionFlags() & 0x01) == 1;
+    }
+
     public int getRecordSize()
     {
-        int charsize = 1;
-
-        if (getOptionFlags() == 1)
-        {
-            charsize = 2;
-        }
+        int charsize = isUncompressedUnicode() ? 2 : 1;
         return 3 + (getString().length() * charsize);
     }
 
@@ -338,11 +343,16 @@ public class UnicodeString
         return this.getString().compareTo(str.getString());
     }
 
+    public boolean isRichText()
+    {
+        return (getOptionFlags() & RICH_TEXT_BIT) != 0;
+    }
+
     int maxBrokenLength(final int proposedBrokenLength)
     {
         int rval = proposedBrokenLength;
 
-        if ((field_2_optionflags & 1) == 1)
+        if (isUncompressedUnicode())
         {
             int proposedStringLength = proposedBrokenLength - 3;
 
@@ -355,12 +365,9 @@ public class UnicodeString
         return rval;
     }
 
-//    public boolean equals(Object obj) {
-//        if (!(obj instanceof UnicodeString)) return false;
-//        
-//        UnicodeString str = (UnicodeString)obj;
-//        
-//        
-//       return this.getString().equals(str.getString());
-//    }    
+    public boolean isExtendedText()
+    {
+        return (getOptionFlags() & EXT_BIT) != 0;
+    }
+
 }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
index 39da13e42..e9209800e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
@@ -126,8 +126,8 @@ public class HSSFRow
         this.sheet = sheet;
         row = new RowRecord();
         row.setHeight((short) 0xff);
-        row.setLastCol((short)-1);
-        row.setFirstCol((short)-1);
+        row.setLastCol((short) -1);
+        row.setFirstCol((short) -1);
 
         // row.setRowNumber(rowNum);
         setRowNum(rowNum);
@@ -213,11 +213,11 @@ public class HSSFRow
 
         if (cell.getCellNum() == row.getLastCol())
         {
-            row.setLastCol( findLastCell(row.getLastCol()) );
+            row.setLastCol(findLastCell(row.getLastCol()));
         }
         if (cell.getCellNum() == row.getFirstCol())
         {
-            row.setFirstCol( findFirstCell(row.getFirstCol()) );
+            row.setFirstCol(findFirstCell(row.getFirstCol()));
         }
     }
 
@@ -270,11 +270,11 @@ public class HSSFRow
     {
         if (row.getFirstCol() == -1)
         {
-            row.setFirstCol( cell.getCellNum() );
+            row.setFirstCol(cell.getCellNum());
         }
         if (row.getLastCol() == -1)
         {
-            row.setLastCol( cell.getCellNum() );
+            row.setLastCol(cell.getCellNum());
         }
         cells.put(new Integer(cell.getCellNum()), cell);
 
@@ -292,8 +292,8 @@ public class HSSFRow
      * get the hssfcell representing a given column (logical cell) 0-based.  If you
      * ask for a cell that is not defined....you get a null.
      *
-     * @param cellnum - 0 based column number
-     * @returns HSSFCell representing that column or null if undefined.
+     * @param cellnum  0 based column number
+     * @return HSSFCell representing that column or null if undefined.
      */
 
     public HSSFCell getCell(short cellnum)
@@ -318,7 +318,10 @@ public class HSSFRow
 
     public short getFirstCellNum()
     {
-        return row.getFirstCol();
+        if (getPhysicalNumberOfCells() == 0)
+            return -1;
+        else
+            return row.getFirstCol();
     }
 
     /**
@@ -328,7 +331,10 @@ public class HSSFRow
 
     public short getLastCellNum()
     {
-        return row.getLastCol();
+        if (getPhysicalNumberOfCells() == 0)
+            return -1;
+        else
+            return row.getLastCol();
     }
 
 
@@ -441,7 +447,7 @@ public class HSSFRow
     }
 
     /**
-     * @returns cell iterator of the physically defined cells.  Note element 4 may
+     * @return cell iterator of the physically defined cells.  Note element 4 may
      * actually be row cell depending on how many are defined!
      */
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index ddb5dc8a6..c6cb96762 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -60,11 +59,14 @@
  */
 package org.apache.poi.hssf.usermodel;
 
-import org.apache.poi.util.POILogFactory;
 import org.apache.poi.hssf.model.Sheet;
 import org.apache.poi.hssf.model.Workbook;
-import org.apache.poi.hssf.record.*;
+import org.apache.poi.hssf.record.CellValueRecordInterface;
+import org.apache.poi.hssf.record.RowRecord;
+import org.apache.poi.hssf.record.VCenterRecord;
+import org.apache.poi.hssf.record.WSBoolRecord;
 import org.apache.poi.hssf.util.Region;
+import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
 import java.util.Iterator;
@@ -74,12 +76,12 @@ import java.util.TreeMap;
  * High level representation of a worksheet.
  * @author  Andrew C. Oliver (acoliver at apache dot org)
  * @author  Glen Stampoultzis (glens at apache.org)
- * @version 1.0-pre
+ * @author  Libin Roman (romal at vistaportal.com)
  */
 
 public class HSSFSheet
 {
-    private static final int DEBUG            = POILogger.DEBUG;
+    private static final int DEBUG = POILogger.DEBUG;
 
     /**
      * Used for compile-time optimization.  This is the initial size for the collection of
@@ -87,17 +89,17 @@ public class HSSFSheet
      * by setting this to a higher number and recompiling a custom edition of HSSFSheet.
      */
 
-    public final static int  INITIAL_CAPACITY = 20;
+    public final static int INITIAL_CAPACITY = 20;
 
     /**
      * reference to the low level Sheet object
      */
 
-    private Sheet            sheet;
-    private TreeMap          rows;
-    private Workbook         book;
-    private int              firstrow;
-    private int              lastrow;
+    private Sheet sheet;
+    private TreeMap rows;
+    private Workbook book;
+    private int firstrow;
+    private int lastrow;
     private static POILogger log = POILogFactory.getLogger(HSSFSheet.class);
 
     /**
@@ -110,8 +112,8 @@ public class HSSFSheet
 
     protected HSSFSheet(Workbook book)
     {
-        sheet     = Sheet.createSheet();
-        rows      = new TreeMap();   // new ArrayList(INITIAL_CAPACITY);
+        sheet = Sheet.createSheet();
+        rows = new TreeMap();   // new ArrayList(INITIAL_CAPACITY);
         this.book = book;
     }
 
@@ -127,16 +129,11 @@ public class HSSFSheet
     protected HSSFSheet(Workbook book, Sheet sheet)
     {
         this.sheet = sheet;
-        rows       = new TreeMap();
-        this.book  = book;
+        rows = new TreeMap();
+        this.book = book;
         setPropertiesFromSheet(sheet);
     }
 
-    /** private default constructor prevents bogus initializationless construction */
-
-    private HSSFSheet()
-    {
-    }
 
     /**
      * used internally to set the properties given a Sheet object
@@ -144,8 +141,8 @@ public class HSSFSheet
 
     private void setPropertiesFromSheet(Sheet sheet)
     {
-        int       sloc = sheet.getLoc();
-        RowRecord row  = sheet.getNextRow();
+        int sloc = sheet.getLoc();
+        RowRecord row = sheet.getNextRow();
 
         while (row != null)
         {
@@ -154,8 +151,8 @@ public class HSSFSheet
             row = sheet.getNextRow();
         }
         sheet.setLoc(sloc);
-        CellValueRecordInterface cval      = sheet.getNextValueRecord();
-        long                     timestart = System.currentTimeMillis();
+        CellValueRecordInterface cval = sheet.getNextValueRecord();
+        long timestart = System.currentTimeMillis();
 
         log.log(DEBUG, "Time at start of cell creating in HSSF sheet = ",
                 new Long(timestart));
@@ -163,8 +160,8 @@ public class HSSFSheet
 
         while (cval != null)
         {
-            long    cellstart = System.currentTimeMillis();
-            HSSFRow hrow      = lastrow;
+            long cellstart = System.currentTimeMillis();
+            HSSFRow hrow = lastrow;
 
             if ((lastrow == null) || (lastrow.getRowNum() != cval.getRow()))
             {
@@ -236,10 +233,10 @@ public class HSSFSheet
 
             while (iter.hasNext())
             {
-                HSSFCell cell = ( HSSFCell ) iter.next();
+                HSSFCell cell = (HSSFCell) iter.next();
 
                 sheet.removeValueRecord(row.getRowNum(),
-                                        cell.getCellValueRecord());
+                        cell.getCellValueRecord());
             }
             sheet.removeRow(row.getRowRecord());
         }
@@ -251,10 +248,10 @@ public class HSSFSheet
 
     private int findLastRow(int lastrow)
     {
-        int     rownum = lastrow - 1;
-        HSSFRow r      = getRow(rownum);
+        int rownum = lastrow - 1;
+        HSSFRow r = getRow(rownum);
 
-        while (r == null)
+        while (r == null && rownum >= 0)
         {
             r = getRow(--rownum);
         }
@@ -267,13 +264,17 @@ public class HSSFSheet
 
     private int findFirstRow(int firstrow)
     {
-        int     rownum = firstrow + 1;
-        HSSFRow r      = getRow(rownum);
+        int rownum = firstrow + 1;
+        HSSFRow r = getRow(rownum);
 
-        while (r == null)
+        while (r == null && rownum <= getLastRowNum())
         {
             r = getRow(++rownum);
         }
+
+        if (rownum > getLastRowNum())
+            return -1;
+
         return rownum;
     }
 
@@ -311,8 +312,8 @@ public class HSSFSheet
     {
         HSSFRow row = new HSSFRow();
 
-        row.setRowNum(( short ) rownum);
-        return ( HSSFRow ) rows.get(row);
+        row.setRowNum((short) rownum);
+        return (HSSFRow) rows.get(row);
     }
 
     /**
@@ -344,26 +345,6 @@ public class HSSFSheet
         return lastrow;
     }
 
-    /**
-     * Seems to be unused (gjs)
-     *
-     * used internally to add cells from a high level row to the low level model
-     * @param row  the row object to represent in low level RowRecord.
-     */
-    private void addCellsFromRow(HSSFRow row)
-    {
-        Iterator iter = row.cellIterator();
-
-        // for (int k = 0; k < row.getPhysicalNumberOfCells(); k++)
-        while (iter.hasNext())
-        {
-            HSSFCell cell =
-                ( HSSFCell ) iter.next();   // row.getPhysicalCellAt(k);
-
-            sheet.addValueRecord(row.getRowNum(), cell.getCellValueRecord());
-        }
-    }
-
     /**
      * set the width (in units of 1/256th of a character width)
      * @param column - the column to set (0-based)
@@ -400,7 +381,7 @@ public class HSSFSheet
     /**
      * get the default row height for the sheet (if the rows do not define their own height) in
      * twips (1/20 of  a point)
-     * @retun  default row height
+     * @return  default row height
      */
 
     public short getDefaultRowHeight()
@@ -449,7 +430,7 @@ public class HSSFSheet
 
     public void setDefaultRowHeightInPoints(float height)
     {
-        sheet.setDefaultRowHeight(( short ) (height * 20));
+        sheet.setDefaultRowHeight((short) (height * 20));
     }
 
     /**
@@ -480,10 +461,10 @@ public class HSSFSheet
 
     public int addMergedRegion(Region region)
     {
-        return sheet.addMergedRegion(( short ) region.getRowFrom(),
-                                     region.getColumnFrom(),
-                                     ( short ) region.getRowTo(),
-                                     region.getColumnTo());
+        return sheet.addMergedRegion((short) region.getRowFrom(),
+                region.getColumnFrom(),
+                (short) region.getRowTo(),
+                region.getColumnTo());
     }
 
     /**
@@ -494,7 +475,7 @@ public class HSSFSheet
     public void setVerticallyCenter(boolean value)
     {
         VCenterRecord record =
-            ( VCenterRecord ) sheet.findFirstRecordBySid(VCenterRecord.sid);
+                (VCenterRecord) sheet.findFirstRecordBySid(VCenterRecord.sid);
 
         record.setVCenter(value);
     }
@@ -506,7 +487,7 @@ public class HSSFSheet
     public boolean getVerticallyCenter(boolean value)
     {
         VCenterRecord record =
-            ( VCenterRecord ) sheet.findFirstRecordBySid(VCenterRecord.sid);
+                (VCenterRecord) sheet.findFirstRecordBySid(VCenterRecord.sid);
 
         return record.getVCenter();
     }
@@ -543,7 +524,7 @@ public class HSSFSheet
     }
 
     /**
-     * @returns an iterator of the PHYSICAL rows.  Meaning the 3rd element may not
+     * @return an iterator of the PHYSICAL rows.  Meaning the 3rd element may not
      * be the third row if say for instance the second row is undefined.
      */
 
@@ -571,7 +552,7 @@ public class HSSFSheet
     public void setAlternativeExpression(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setAlternateExpression(b);
     }
@@ -584,7 +565,7 @@ public class HSSFSheet
     public void setAlternativeFormula(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setAlternateFormula(b);
     }
@@ -597,7 +578,7 @@ public class HSSFSheet
     public void setAutobreaks(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setAutobreaks(b);
     }
@@ -610,7 +591,7 @@ public class HSSFSheet
     public void setDialog(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setDialog(b);
     }
@@ -624,7 +605,7 @@ public class HSSFSheet
     public void setDisplayGuts(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setDisplayGuts(b);
     }
@@ -637,7 +618,7 @@ public class HSSFSheet
     public void setFitToPage(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setFitToPage(b);
     }
@@ -650,7 +631,7 @@ public class HSSFSheet
     public void setRowSumsBelow(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setRowSumsBelow(b);
     }
@@ -663,7 +644,7 @@ public class HSSFSheet
     public void setRowSumsRight(boolean b)
     {
         WSBoolRecord record =
-            ( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid);
+                (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setRowSumsRight(b);
     }
@@ -675,8 +656,8 @@ public class HSSFSheet
 
     public boolean getAlternateExpression()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getAlternateExpression();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getAlternateExpression();
     }
 
     /**
@@ -686,8 +667,8 @@ public class HSSFSheet
 
     public boolean getAlternateFormula()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getAlternateFormula();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getAlternateFormula();
     }
 
     /**
@@ -697,8 +678,8 @@ public class HSSFSheet
 
     public boolean getAutobreaks()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getAutobreaks();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getAutobreaks();
     }
 
     /**
@@ -708,8 +689,8 @@ public class HSSFSheet
 
     public boolean getDialog()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getDialog();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getDialog();
     }
 
     /**
@@ -720,8 +701,8 @@ public class HSSFSheet
 
     public boolean getDisplayGuts()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getDisplayGuts();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getDisplayGuts();
     }
 
     /**
@@ -731,8 +712,8 @@ public class HSSFSheet
 
     public boolean getFitToPage()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getFitToPage();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getFitToPage();
     }
 
     /**
@@ -742,8 +723,8 @@ public class HSSFSheet
 
     public boolean getRowSumsBelow()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getRowSumsBelow();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getRowSumsBelow();
     }
 
     /**
@@ -753,7 +734,7 @@ public class HSSFSheet
 
     public boolean getRowSumsRight()
     {
-        return (( WSBoolRecord ) sheet.findFirstRecordBySid(WSBoolRecord.sid))
-            .getRowSumsRight();
+        return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid))
+                .getRowSumsRight();
     }
 }
diff --git a/src/java/org/apache/poi/util/HexDump.java b/src/java/org/apache/poi/util/HexDump.java
index 4e0cfd35a..49bca34ff 100644
--- a/src/java/org/apache/poi/util/HexDump.java
+++ b/src/java/org/apache/poi/util/HexDump.java
@@ -81,6 +81,7 @@ public class HexDump
      * @param stream the OutputStream to which the data is to be
      *               written
      * @param index initial index into the byte array
+     * @param length number of characters to output
      *
      * @exception IOException is thrown if anything goes wrong writing
      *            the data to stream
@@ -89,11 +90,10 @@ public class HexDump
      * @exception IllegalArgumentException if the output stream is
      *            null
      */
-
     public synchronized static void dump(final byte [] data, final long offset,
-                            final OutputStream stream, final int index)
-        throws IOException, ArrayIndexOutOfBoundsException,
-                IllegalArgumentException
+                            final OutputStream stream, final int index, final int length)
+            throws IOException, ArrayIndexOutOfBoundsException,
+                    IllegalArgumentException
     {
         if ((index < 0) || (index >= data.length))
         {
@@ -108,9 +108,11 @@ public class HexDump
         long         display_offset = offset + index;
         StringBuffer buffer         = new StringBuffer(74);
 
-        for (int j = index; j < data.length; j += 16)
+
+        int data_length = Math.min(data.length,index+length);
+        for (int j = index; j < data_length; j += 16)
         {
-            int chars_read = data.length - j;
+            int chars_read = data_length - j;
 
             if (chars_read > 16)
             {
@@ -146,6 +148,32 @@ public class HexDump
             buffer.setLength(0);
             display_offset += chars_read;
         }
+
+    }
+
+    /**
+     * dump an array of bytes to an OutputStream
+     *
+     * @param data the byte array to be dumped
+     * @param offset its offset, whatever that might mean
+     * @param stream the OutputStream to which the data is to be
+     *               written
+     * @param index initial index into the byte array
+     *
+     * @exception IOException is thrown if anything goes wrong writing
+     *            the data to stream
+     * @exception ArrayIndexOutOfBoundsException if the index is
+     *            outside the data array's bounds
+     * @exception IllegalArgumentException if the output stream is
+     *            null
+     */
+
+    public synchronized static void dump(final byte [] data, final long offset,
+                            final OutputStream stream, final int index)
+        throws IOException, ArrayIndexOutOfBoundsException,
+                IllegalArgumentException
+    {
+        dump(data, offset, stream, index, data.length-index);
     }
 
     public static final String        EOL         =
diff --git a/src/java/org/apache/poi/util/HexRead.java b/src/java/org/apache/poi/util/HexRead.java
new file mode 100644
index 000000000..c1bda6f61
--- /dev/null
+++ b/src/java/org/apache/poi/util/HexRead.java
@@ -0,0 +1,116 @@
+package org.apache.poi.util;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.ArrayList;
+
+public class HexRead
+{
+    public static byte[] readTestData( String filename )
+            throws IOException
+    {
+        File file = new File( filename );
+        FileInputStream stream = new FileInputStream( file );
+        int characterCount = 0;
+        byte b = (byte) 0;
+        List bytes = new ArrayList();
+        boolean done = false;
+
+        while ( !done )
+        {
+            int count = stream.read();
+
+            switch ( count )
+            {
+
+                case '#':
+                    readToEOL(stream);
+                    break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    b <<= 4;
+                    b += (byte) ( count - '0' );
+                    characterCount++;
+                    if ( characterCount == 2 )
+                    {
+                        bytes.add( new Byte( b ) );
+                        characterCount = 0;
+                        b = (byte) 0;
+                    }
+                    break;
+
+                case 'A':
+                case 'B':
+                case 'C':
+                case 'D':
+                case 'E':
+                case 'F':
+                    b <<= 4;
+                    b += (byte) ( count + 10 - 'A' );
+                    characterCount++;
+                    if ( characterCount == 2 )
+                    {
+                        bytes.add( new Byte( b ) );
+                        characterCount = 0;
+                        b = (byte) 0;
+                    }
+                    break;
+
+                case 'a':
+                case 'b':
+                case 'c':
+                case 'd':
+                case 'e':
+                case 'f':
+                    b <<= 4;
+                    b += (byte) ( count + 10 - 'a' );
+                    characterCount++;
+                    if ( characterCount == 2 )
+                    {
+                        bytes.add( new Byte( b ) );
+                        characterCount = 0;
+                        b = (byte) 0;
+                    }
+                    break;
+
+                case -1:
+                    done = true;
+                    break;
+
+                default :
+                    break;
+            }
+        }
+        stream.close();
+        Byte[] polished = (Byte[]) bytes.toArray( new Byte[0] );
+        byte[] rval = new byte[polished.length];
+
+        for ( int j = 0; j < polished.length; j++ )
+        {
+            rval[j] = polished[j].byteValue();
+        }
+        return rval;
+    }
+
+    static private void readToEOL( InputStream stream ) throws IOException
+    {
+        int c = stream.read();
+        while ( c != -1 && c != '\n' && c != '\r')
+        {
+            c = stream.read();
+        }
+    }
+
+
+}
diff --git a/src/java/org/apache/poi/util/LittleEndian.java b/src/java/org/apache/poi/util/LittleEndian.java
index 6c7a4f4d2..21b0c69ea 100644
--- a/src/java/org/apache/poi/util/LittleEndian.java
+++ b/src/java/org/apache/poi/util/LittleEndian.java
@@ -236,13 +236,27 @@ public class LittleEndian
      *
      * @exception ArrayIndexOutOfBoundsException may be thrown
      */
-
     public static void putShort(final byte[] data, final int offset,
                                 final short value)
     {
         putNumber(data, offset, value, SHORT_SIZE);
     }
 
+    /**
+     * put an unsigned short value into a byte array
+     *
+     * @param data the byte array
+     * @param offset a starting offset into the byte array
+     * @param value the short (16-bit) value
+     *
+     * @exception ArrayIndexOutOfBoundsException may be thrown
+     */
+    public static void putUShort(final byte[] data, final int offset,
+                                final int value)
+    {
+        putNumber(data, offset, value, SHORT_SIZE);
+    }
+
     /**
      * put a array of shorts into a byte array
      *
@@ -592,4 +606,17 @@ public class LittleEndian
         return copy;
     }
 
+    /**
+     * Retrieves and unsigned short.  This is converted UP to a int
+     * so it can fit.
+     *
+     * @param data      The data to read
+     * @param offset    The offset to read the short from
+     * @return An integer representation of the short.
+     */
+    public static int getUShort( byte[] data, int offset )
+    {
+        return (int)getNumber(data, offset, SHORT_SIZE);
+    }
+
 }
diff --git a/src/java/org/apache/poi/util/POILogFactory.java b/src/java/org/apache/poi/util/POILogFactory.java
index 2378ab86a..8c52a367a 100644
--- a/src/java/org/apache/poi/util/POILogFactory.java
+++ b/src/java/org/apache/poi/util/POILogFactory.java
@@ -1,4 +1,3 @@
-
 /*
  * ====================================================================
  * The Apache Software License, Version 1.1
@@ -55,12 +54,8 @@
  */
 package org.apache.poi.util;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import java.util.*;
-
-import org.apache.commons.logging.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Provides logging without clients having to mess with
@@ -73,10 +68,10 @@ import org.apache.commons.logging.*;
 
 public class POILogFactory
 {
-    private static LogFactory   _creator = LogFactory.getFactory();
+//    private static LogFactory _creator = LogFactory.getFactory();
 
     // map of POILogger instances, with classes as keys
-    private static Map          _loggers = new HashMap();;
+    private static Map _loggers = new HashMap();;
 
 
     /**
@@ -95,11 +90,11 @@ public class POILogFactory
      * @return a POILogger for the specified class
      */
 
-    public static POILogger getLogger(final Class theclass)
+    public static POILogger getLogger( final Class theclass )
     {
-        return getLogger(theclass.getName());
+        return getLogger( theclass.getName() );
     }
-    
+
     /**
      * Get a logger, based on a String
      *
@@ -108,20 +103,20 @@ public class POILogFactory
      * @return a POILogger for the specified class
      */
 
-    public static POILogger getLogger(final String cat)
+    public static POILogger getLogger( final String cat )
     {
         POILogger logger = null;
 
-        if (_loggers.containsKey(cat))
+        if ( _loggers.containsKey( cat ) )
         {
-            logger = ( POILogger ) _loggers.get(cat);
+            logger = (POILogger) _loggers.get( cat );
         }
         else
         {
-            logger = new POILogger(_creator.getInstance(cat));
-            _loggers.put(cat, logger);
+            logger = new POILogger( );
+            _loggers.put( cat, logger );
         }
         return logger;
     }
-        
+
 }   // end public class POILogFactory
diff --git a/src/java/org/apache/poi/util/POILogger.java b/src/java/org/apache/poi/util/POILogger.java
index a6d066c38..b47a38023 100644
--- a/src/java/org/apache/poi/util/POILogger.java
+++ b/src/java/org/apache/poi/util/POILogger.java
@@ -55,8 +55,6 @@
  */
 package org.apache.poi.util;
 
-import org.apache.commons.logging.Log;
-
 import java.util.*;
 
 /**
@@ -72,7 +70,7 @@ import java.util.*;
 
 public class POILogger
 {
-    private Log             log   = null;
+//    private Log             log   = null;
     public static final int DEBUG = 1;
     public static final int INFO  = 3;
     public static final int WARN  = 5;
@@ -82,13 +80,10 @@ public class POILogger
     /**
      * package scope so it cannot be instantiated outside of the util
      * package. You need a POILogger? Go to the POILogFactory for one
-     *
-     * @param log the object that does the real work of logging
      */
 
-    POILogger(final Log log)
+    POILogger()
     {
-        this.log = log;
     }
 
     /**
@@ -100,91 +95,73 @@ public class POILogger
 
     public void log(final int level, final Object obj1)
     {
-        if(level==FATAL)
-        {
-          if(log.isFatalEnabled())
-          {
-            log.fatal(obj1);
-          }
-        }
-        else if(level==ERROR)
-        {
-          if(log.isErrorEnabled())
-          {
-            log.error(obj1);
-          }
-        }
-        else if(level==WARN)
-        {
-          if(log.isWarnEnabled())
-          {
-            log.warn(obj1);
-          }
-        }
-        else if(level==INFO)
-        {
-          if(log.isInfoEnabled())
-          {
-            log.info(obj1);
-          }
-        }
-        else if(level==DEBUG)
-        {
-          if(log.isDebugEnabled())
-          {
-            log.debug(obj1);
-          }
-        }
-        else
-        {
-          if(log.isTraceEnabled())
-          {
-            log.trace(obj1);
-          }
-        }
+        if (check(level))
+            System.out.println( obj1 );
+    }
 
+    private boolean isDebugEnabled()
+    {
+        return System.getProperty("poi.logging") != null;
+    }
+
+    private boolean isInfoEnabled()
+    {
+        return false;
+    }
+
+    private boolean isWarnEnabled()
+    {
+        return System.getProperty("poi.logging") != null;
+    }
+
+    private boolean isErrorEnabled()
+    {
+        return System.getProperty("poi.logging") != null;
+    }
+
+    private boolean isFatalEnabled()
+    {
+        return System.getProperty("poi.logging") != null;
     }
 
     /**
      * Check if a logger is enabled to log at the specified level
      *
      * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The logger to check.
      */
-
-    public boolean check(final Log log, final int level)
+    public boolean check(final int level)
     {
         if(level==FATAL)
         {
-          if(log.isFatalEnabled())
+          if(isFatalEnabled())
           {
             return true;
           }
         }
         else if(level==ERROR)
         {
-          if(log.isErrorEnabled())
+          if(isErrorEnabled())
           {
             return true;
           }
         }
         else if(level==WARN)
         {
-          if(log.isWarnEnabled())
+          if(isWarnEnabled())
           {
             return true;
           }
         }
         else if(level==INFO)
         {
-          if(log.isInfoEnabled())
+          if(isInfoEnabled())
           {
             return true;
           }
         }
         else if(level==DEBUG)
         {
-          if(log.isDebugEnabled())
+          if(isDebugEnabled())
           {
             return true;
           }
@@ -204,7 +181,7 @@ public class POILogger
 
     public void log(final int level, final Object obj1, final Object obj2)
     {
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(32).append(obj1).append(obj2));
         }
@@ -222,13 +199,9 @@ public class POILogger
     public void log(final int level, final Object obj1, final Object obj2,
                     final Object obj3)
     {
-        
-
-        if (check(log, level))
+        if (check( level))
         {
-            log(level,
-                    new StringBuffer(48).append(obj1).append(obj2)
-                        .append(obj3));
+            log(level, new StringBuffer(48).append(obj1).append(obj2 ).append(obj3));
         }
     }
 
@@ -247,7 +220,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level,
                     new StringBuffer(64).append(obj1).append(obj2)
@@ -271,7 +244,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level,
                     new StringBuffer(80).append(obj1).append(obj2)
@@ -297,7 +270,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level ,
                     new StringBuffer(96).append(obj1).append(obj2)
@@ -324,7 +297,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level,
                     new StringBuffer(112).append(obj1).append(obj2)
@@ -353,7 +326,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level,
                     new StringBuffer(128).append(obj1).append(obj2)
@@ -390,7 +363,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(32).append(obj1).append(obj2),
                     exception);
@@ -412,7 +385,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(48).append(obj1).append(obj2)
                 .append(obj3), exception);
@@ -436,7 +409,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(64).append(obj1).append(obj2)
                 .append(obj3).append(obj4), exception);
@@ -461,7 +434,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(80).append(obj1).append(obj2)
                 .append(obj3).append(obj4).append(obj5), exception);
@@ -487,7 +460,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level , new StringBuffer(96).append(obj1)
                 .append(obj2).append(obj3).append(obj4).append(obj5)
@@ -516,7 +489,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(112).append(obj1).append(obj2)
                 .append(obj3).append(obj4).append(obj5).append(obj6)
@@ -546,7 +519,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             log(level, new StringBuffer(128).append(obj1).append(obj2)
                 .append(obj3).append(obj4).append(obj5).append(obj6)
@@ -703,7 +676,7 @@ public class POILogger
     {
         
 
-        if (check(log, level))
+        if (check( level))
         {
             Object[] params = flattenArrays(unflatParams);
 
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord b/src/testcases/org/apache/poi/hssf/data/BigSSTRecord
index 6cebff51b..3dd8f9ebd 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord
+++ b/src/testcases/org/apache/poi/hssf/data/BigSSTRecord
@@ -1,516 +1,516 @@
-FC 00 20
-20 B8 05 00 00 B0 02 00 00 0C 00 00 4D 61 6E 75
-66 61 63 74 75 72 65 72 0B 00 00 50 61 72 74 20
-4E 75 6D 62 65 72 05 00 00 53 63 61 6C 65 04 00
-00 54 79 70 65 04 00 00 4E 61 6D 65 08 00 00 43
-6F 6D 6D 65 6E 74 73 08 00 00 41 4D 54 2D 45 52
-54 4C 07 00 00 48 6F 74 20 52 6F 64 10 00 00 33
-32 20 46 6F 72 64 20 52 6F 61 64 73 74 65 72 08
-00 00 4D 6F 6E 6F 67 72 61 6D 08 00 00 53 68 6F
-77 20 52 6F 64 07 00 00 48 61 6E 67 6D 61 6E 11
-00 00 50 65 74 65 72 62 69 6C 74 20 57 72 65 63
-6B 65 72 15 00 00 45 61 73 74 65 72 6E 20 41 69
-72 6C 69 6E 65 73 20 44 43 2D 33 11 00 00 4D 61
-73 65 72 61 74 69 20 4D 65 72 61 6B 20 53 53 1A
-00 00 44 6F 75 67 6C 61 73 20 50 2D 37 30 20 4E
-69 67 68 74 20 46 69 67 68 74 65 72 17 00 00 35
-35 20 43 68 65 76 79 20 53 74 72 65 65 74 20 4D
-61 63 68 69 6E 65 0C 00 00 54 77 65 65 64 79 20
-50 69 65 20 32 13 00 00 48 75 65 79 20 52 65 73
-63 75 65 20 43 68 6F 70 70 65 72 10 00 00 4D 61
-7A 64 61 20 4D 58 2D 35 20 4D 69 61 74 61 0A 00
-00 53 70 6F 72 74 73 20 43 61 72 05 00 00 54 72
-75 63 6B 06 00 00 52 6F 63 6B 65 74 09 00 00 50
-61 72 74 73 20 4B 69 74 0E 00 00 43 69 76 69 6C
-69 61 6E 20 50 6C 61 6E 65 0E 00 00 4D 69 6C 69
-74 61 72 79 20 50 6C 61 6E 65 0F 00 00 53 63 69
-65 6E 63 65 20 46 69 63 74 69 6F 6E 1A 00 00 44
-6F 6E 20 47 61 72 6C 69 74 73 20 57 79 6E 6E 27
-73 20 43 68 61 72 67 65 72 19 00 00 44 6F 6E 20
-47 61 72 6C 69 74 73 20 57 79 6E 6E 27 73 20 4A
-61 6D 6D 65 72 1A 00 00 50 61 63 6B 61 72 64 20
-42 6F 61 74 74 61 69 6C 20 53 70 65 65 64 73 74
-65 72 0E 00 00 52 65 76 65 6C 6C 20 47 65 72 6D
-61 6E 79 05 00 00 30 34 31 34 36 04 00 00 31 2F
-32 34 04 00 00 31 2F 37 32 0E 00 00 4D 65 20 32
-36 32 20 41 2D 31 61 2F 55 33 09 00 00 53 54 43
-20 53 74 61 72 74 04 00 00 34 63 2D 39 05 00 00
-31 2F 32 38 38 0C 00 00 50 72 6F 74 6F 6E 2D 4B
-20 4D 69 72 04 00 00 34 63 2D 37 0E 00 00 50 72
-6F 74 6F 6E 2D 4B 20 41 73 74 72 61 05 00 00 34
-63 2D 31 37 0E 00 00 50 72 6F 74 6F 6E 2D 4B 20
-5A 61 72 79 61 13 00 00 41 63 63 75 72 61 74 65
-20 4D 69 6E 69 61 74 75 72 65 73 04 00 00 33 34
-32 30 04 00 00 31 2F 34 38 0F 00 00 53 42 44 2D
-31 20 44 61 75 6E 74 6C 65 73 73 1B 00 00 77 2F
-56 65 72 6C 69 6E 64 65 6E 20 31 33 37 38 20 44
-65 74 61 69 6C 20 53 65 74 04 00 00 38 32 38 33
-0C 00 00 54 72 6F 75 62 6C 65 6D 61 6B 65 72 04
-00 00 32 37 33 37 0E 00 00 44 61 79 74 6F 6E 61
-20 53 70 69 64 65 72 04 00 00 38 31 32 36 04 00
-00 31 2F 32 35 06 00 00 48 65 6C 6C 65 72 05 00
-00 38 30 34 34 33 05 00 00 31 2F 31 34 34 12 00
-00 42 72 65 69 74 6C 69 6E 20 4F 72 62 69 74 65
-72 20 33 0F 00 00 53 68 61 6E 67 68 61 69 20 44
-72 61 67 6F 6E 04 00 00 31 39 39 38 04 00 00 31
-2F 39 36 0F 00 00 41 72 69 61 6E 65 20 35 20 52
-6F 63 6B 65 74 0F 00 00 52 65 76 65 6C 6C 2D 4D
-6F 6E 6F 67 72 61 6D 07 00 00 38 35 2D 35 39 33
-34 0F 00 00 50 42 59 2D 35 41 20 43 61 74 61 6C
-69 6E 61 0A 00 00 50 72 6F 4D 6F 64 65 6C 65 72
-07 00 00 47 6C 65 6E 63 6F 65 05 00 00 30 35 32
-30 32 04 00 00 31 2F 33 35 16 00 00 50 69 61 73
-65 63 6B 69 20 5A 56 2D 38 50 20 41 69 72 67 65
-65 70 08 00 00 48 61 73 65 67 61 77 61 05 00 00
-30 39 31 36 39 20 00 00 53 42 44 2D 33 20 44 61
-75 6E 74 6C 65 73 73 20 27 55 53 53 20 45 6E 74
-65 72 70 72 69 73 65 27 0C 00 00 53 69 6C 76 65
-72 20 43 6C 6F 75 64 06 00 00 53 43 34 38 30 31
-19 00 00 53 75 70 65 72 6D 61 72 69 6E 65 20 53
-70 69 74 65 66 75 6C 20 46 2E 31 34 06 00 00 52
-65 76 65 6C 6C 07 00 00 38 35 2D 31 36 35 34 0D
-00 00 50 2D 35 31 42 20 4D 75 73 74 61 6E 67 09
-00 00 50 72 6F 46 69 6E 69 73 68 06 00 00 44 72
-61 67 6F 6E 04 00 00 35 39 30 31 0B 00 00 46 6F
-6B 6B 65 72 20 44 72 2E 31 07 00 00 49 74 61 6C
-65 72 69 03 00 00 38 34 36 25 00 00 43 2D 31 33
-30 4A 20 48 65 72 63 75 6C 65 73 20 48 65 61 76
-79 20 54 72 61 6E 73 70 6F 72 74 20 50 6C 61 6E
-65 04 00 00 37 36 31 30 15 00 00 46 65 72 72 61
-72 69 20 46 35 30 20 42 61 72 63 68 65 74 74 61
-03 00 00 41 4D 54 08 00 00 54 33 37 34 2D 32 32
-35 0D 00 00 43 6F 72 76 61 69 72 20 4D 6F 6E 7A
-61 04 00 00 35 30 30 33 0B 00 00 4D 63 4C 61 72
-65 6E 20 4D 38 42 0D 00 00 52 65 76 65 6C 6C 20
-4C 6F 64 65 6C 61 05 00 00 48 2D 32 36 33 03 00
-00 75 6E 6B 23 00 00 42 6F 65 69 6E 67 20 53 53
-54 20 50 61 6E 41 6D 20 43 6C 69 70 70 65 72 20
-53 75 70 65 72 73 6F 6E 69 63 05 00 00 30 35 39
-30 39 05 00 00 31 2F 33 30 30 1D 00 00 4E 75 63
-6C 65 61 72 20 50 6F 77 65 72 65 64 20 53 70 61
-63 65 20 53 74 61 74 69 6F 6E 04 00 00 38 37 36
-34 06 00 00 31 2F 32 35 30 30 19 00 00 53 74 61
-72 20 54 72 65 6B 20 44 65 65 70 20 53 70 61 63
-65 20 4E 69 6E 65 23 00 00 46 69 62 65 72 2D 6F
-70 74 69 63 20 4C 69 67 68 74 69 6E 67 2C 20 73
-6B 69 6C 6C 20 6C 65 76 65 6C 20 33 0D 00 00 53
-6B 69 6C 6C 20 6C 65 76 65 6C 20 33 04 00 00 38
-31 35 38 16 00 00 42 6C 75 65 70 72 69 6E 74 65
-72 20 50 61 72 74 73 20 50 61 63 6B 13 00 00 45
-6E 67 69 6E 65 73 20 61 6E 64 20 67 72 69 6C 6C
-65 73 05 00 00 33 30 30 33 37 05 00 00 31 2F 32
-30 30 1E 00 00 4D 61 6E 20 49 6E 20 53 70 61 63
-65 20 52 6F 63 6B 65 74 20 43 6F 6C 6C 65 63 74
-69 6F 6E 53 00 00 4D 65 72 63 75 72 79 20 41 74
-6C 61 73 2C 20 4D 65 72 63 75 72 79 20 52 65 64
-73 74 6F 6E 65 2C 20 47 65 6D 69 6E 69 20 54 69
-74 61 6E 20 49 49 2C 20 53 61 74 75 72 6E 20 31
-42 20 41 70 6F 6C 6C 6F 2C 20 53 61 74 75 72 6E
-20 56 20 41 70 6F 6C 6C 6F 04 00 00 35 30 38 33
-04 00 00 31 2F 33 32 11 00 00 41 70 6F 6C 6C 6F
-20 53 70 61 63 65 63 72 61 66 74 09 00 00 4D 69
-6E 69 63 72 61 66 74 05 00 00 31 31 32 32 30 04
-00 00 31 2F 31 36 24 00 00 31 39 35 35 20 4D 65
-72 63 65 64 65 73 20 33 30 30 53 4C 20 22 47 75
-6C 6C 77 69 6E 67 22 20 43 6F 75 70 65 07 00 00
-38 35 2D 36 38 35 39 24 00 00 4D 75 73 74 61 6E
-67 20 4D 75 73 63 6C 65 20 54 72 69 6F 20 27 36
-30 73 2C 20 27 37 30 73 2C 20 27 38 30 73 35 00
-00 31 39 36 34 20 31 2F 32 20 43 6F 6E 76 65 72
-74 69 62 6C 65 2C 20 31 39 37 30 20 42 6F 73 73
-20 33 30 32 2C 20 31 39 38 39 20 43 6F 6E 76 65
-72 74 69 62 6C 65 06 00 00 54 61 6D 69 79 61 05
-00 00 32 34 31 37 30 0A 00 00 4D 6F 72 67 61 6E
-20 34 2F 34 07 00 00 38 35 2D 32 34 39 31 11 00
-00 36 37 20 43 6F 72 76 65 74 74 65 20 43 6F 75
-70 65 07 00 00 38 35 2D 32 35 33 34 0F 00 00 53
-68 65 6C 62 79 20 53 65 72 69 65 73 20 31 03 00
-00 35 36 32 11 00 00 41 73 74 6F 6E 20 4D 61 72
-74 69 6E 20 44 42 20 34 05 00 00 30 37 33 32 30
-13 00 00 50 6F 72 73 63 68 65 20 39 31 31 20 43
-61 72 72 65 72 61 07 00 00 54 65 73 74 6F 72 73
-03 00 00 33 38 36 04 00 00 32 39 37 32 16 00 00
-4D 65 72 63 65 64 65 73 20 33 30 30 20 53 4C 52
-20 22 37 32 32 22 08 00 00 4C 69 6E 64 62 65 72
-67 05 00 00 37 30 39 35 36 19 00 00 48 65 6C 6C
-63 61 74 73 20 76 73 2E 20 42 65 74 74 79 20 42
-6F 6D 62 65 72 0C 00 00 48 65 6C 6C 63 61 74 20
-6F 6E 6C 79 05 00 00 30 34 36 30 39 18 00 00 45
-6B 72 61 6E 6F 70 6C 61 6E 20 41 2D 39 30 20 4F
-72 6C 6A 6F 6E 6F 6B 05 00 00 31 31 36 32 36 18
-00 00 47 72 75 6D 6D 61 6E 20 58 46 35 46 2D 31
-20 53 6B 79 72 6F 63 6B 65 74 04 00 00 35 34 32
-30 0E 00 00 48 61 77 6B 65 72 20 48 61 72 72 69
-65 72 05 00 00 41 56 2D 38 41 06 00 00 65 64 75
-61 72 64 04 00 00 38 30 36 31 0F 00 00 50 2D 34
-30 30 20 41 69 72 61 63 6F 62 72 61 0B 00 00 43
-7A 65 63 68 20 4D 6F 64 65 6C 04 00 00 34 38 30
-36 16 00 00 43 75 72 74 69 73 73 20 58 50 2D 35
-35 20 41 73 63 65 6E 64 65 72 05 00 00 36 31 30
-37 34 14 00 00 44 6F 72 6E 69 65 72 20 44 6F 33
-33 35 41 20 50 66 69 65 6C 13 00 00 4B 79 75 73
-68 75 20 4A 37 57 31 20 53 68 69 6E 64 65 6E 0D
-00 00 50 6C 61 6E 65 74 20 4D 6F 64 65 6C 73 03
-00 00 30 34 33 0F 00 00 48 65 6E 73 63 68 65 6C
-20 48 73 20 50 38 37 05 00 00 52 65 73 69 6E 0D
-00 00 53 70 65 63 69 61 6C 20 48 6F 62 62 79 08
-00 00 53 48 20 34 38 30 30 33 16 00 00 4D 63 44
-6F 6E 6E 65 6C 6C 20 58 46 2D 38 35 20 47 6F 62
-6C 69 6E 2A 00 00 4D 65 73 73 65 72 73 63 68 6D
-69 74 74 20 42 66 31 30 39 45 20 27 42 75 6C 67
-61 72 69 61 6E 20 41 69 72 20 46 6F 72 63 65 27
-05 00 00 30 34 32 30 36 2D 00 00 41 69 72 62 75
-73 20 53 75 70 65 72 20 54 72 61 6E 73 70 6F 72
-74 65 72 20 41 33 30 30 2D 36 30 30 20 53 54 20
-22 42 65 6C 75 67 61 22 05 00 00 33 30 30 38 37
-0C 00 00 33 39 20 57 61 67 6F 6E 20 52 6F 64 04
-00 00 37 31 32 31 1A 00 00 31 39 33 32 20 46 6F
-72 64 20 48 69 67 68 62 6F 79 20 52 6F 61 64 73
-74 65 72 2E 00 00 4C 69 6E 63 6F 6C 6E 20 4D 69
-6E 74 20 55 6C 74 72 61 20 4D 65 74 61 6C 20 53
-65 72 69 65 73 2C 20 53 6B 69 6C 6C 20 6C 65 76
-65 6C 20 33 0C 00 00 50 6F 6C 61 72 20 4C 69 67
-68 74 73 04 00 00 35 30 31 34 21 00 00 43 61 72
-6C 20 43 61 73 70 65 72 27 73 20 55 6E 64 65 72
-74 61 6B 65 72 20 44 72 61 67 73 74 65 72 07 00
-00 38 35 2D 32 35 39 32 20 00 00 33 39 20 43 68
-65 76 79 20 53 65 64 61 6E 20 44 65 6C 69 76 65
-72 79 20 4C 6F 77 72 69 64 65 72 07 00 00 38 35
-2D 35 39 30 34 12 00 00 4E 41 53 41 20 53 70 61
-63 65 20 53 68 75 74 74 6C 65 04 00 00 32 34 30
-30 1C 00 00 31 39 32 36 20 4D 61 63 6B 20 42 75
-6C 6C 64 6F 67 20 44 75 6D 70 20 54 72 75 63 6B
-05 00 00 43 31 31 32 38 13 00 00 32 33 20 54 20
-52 6F 61 64 73 74 65 72 20 46 72 61 6D 65 05 00
-00 33 31 32 31 36 11 00 00 44 6F 64 67 65 20 56
-69 70 65 72 20 52 54 2D 31 30 07 00 00 50 72 6F
-53 68 6F 70 04 00 00 32 33 30 31 05 00 00 31 31
-32 31 32 26 00 00 31 39 33 35 20 4D 6F 72 67 61
-6E 20 53 75 70 65 72 20 53 70 6F 72 74 73 20 54
-68 72 65 65 20 57 68 65 65 6C 65 72 0C 00 00 47
-75 6E 7A 65 20 53 61 6E 67 79 6F 13 00 00 54 72
-69 75 6D 70 68 20 54 52 32 20 4C 65 20 4D 61 6E
-73 07 00 00 38 35 2D 31 39 31 31 0F 00 00 33 34
-20 46 6F 72 64 20 48 69 67 68 62 6F 79 17 00 00
-57 68 65 65 6C 73 20 6F 66 20 46 69 72 65 20 53
-6E 61 70 54 69 74 65 06 00 00 4A 6F 2D 48 61 6E
-06 00 00 47 43 2D 33 30 30 20 00 00 43 68 72 79
-73 6C 65 72 20 43 6F 72 70 6F 72 61 74 69 6F 6E
-20 54 75 72 62 69 6E 65 20 43 61 72 09 00 00 48
-31 32 38 35 3A 31 39 38 2B 00 00 54 6F 6D 6D 79
-20 49 76 6F 27 73 20 46 6F 75 72 20 45 6E 67 69
-6E 65 20 44 72 61 67 73 74 65 72 20 22 53 68 6F
-77 62 6F 61 74 22 09 00 00 48 31 32 32 34 3A 32
-30 30 17 00 00 32 32 20 4A 52 20 52 6F 61 64 73
-74 65 72 20 44 72 61 67 73 74 65 72 0F 00 00 32
-20 63 6F 6D 70 6C 65 74 65 20 63 61 72 73 04 00
-00 36 34 33 35 04 00 00 36 34 33 38 07 00 00 38
-35 2D 37 36 36 38 0F 00 00 34 31 20 43 68 65 76
-79 20 50 69 63 6B 75 70 04 00 00 36 35 38 35 17
-00 00 42 61 62 79 6C 6F 6E 20 35 20 53 74 61 72
-66 75 72 79 20 4D 6B 2E 31 1C 00 00 4D 65 73 73
-65 72 73 63 68 6D 69 74 74 20 42 66 31 30 39 45
-20 47 61 6C 6C 61 6E 64 05 00 00 36 31 30 36 37
-1B 00 00 42 72 69 73 74 6F 6C 20 42 65 61 75 66
-69 67 68 74 65 72 20 54 46 2E 4D 6B 2E 58 12 00
-00 48 65 6E 73 63 68 65 6C 20 48 73 20 31 32 39
-42 2D 32 04 00 00 33 34 31 39 0D 00 00 50 2D 35
-31 43 20 4D 75 73 74 61 6E 67 07 00 00 38 35 2D
-35 35 30 39 1B 00 00 48 65 69 6E 6B 65 6C 20 48
-65 31 31 31 20 47 65 72 6D 61 6E 20 42 6F 6D 62
-65 72 11 00 00 41 63 61 64 65 6D 79 20 4D 69 6E
-69 63 72 61 66 74 04 00 00 32 31 34 35 1E 00 00
-4C 6F 63 6B 68 65 65 64 20 50 2D 33 38 4D 20 4E
-69 67 68 74 20 4C 69 67 68 74 6E 69 6E 67 07 00
-00 38 35 2D 30 31 33 35 11 00 00 4F 53 32 55 2D
-33 20 4B 69 6E 67 66 69 73 68 65 72 3B 00 00 41
-69 63 68 69 20 42 37 41 32 20 41 74 74 61 63 6B
-20 42 6F 6D 62 65 72 20 20 52 79 75 73 65 69 20
-4B 61 69 20 28 47 72 61 63 65 29 20 27 46 6F 6C
-64 69 6E 67 20 57 69 6E 67 27 15 00 00 58 46 35
-55 2D 31 20 46 6C 79 69 6E 67 20 50 61 6E 63 61
-6B 65 04 00 00 36 37 35 37 07 00 00 49 63 65 20
-27 54 27 07 00 00 38 35 2D 35 31 30 32 04 00 00
-53 68 69 70 15 00 00 55 2E 53 2E 53 2E 20 4E 6F
-72 74 68 20 43 61 72 6F 6C 69 6E 61 0E 00 00 50
-61 72 74 73 20 62 79 20 50 61 72 6B 73 04 00 00
-31 30 30 34 0F 00 00 44 69 73 74 72 69 62 75 74
-6F 72 20 4B 69 74 12 00 00 50 53 46 20 4D 6F 64
-65 6C 20 53 75 70 70 6C 69 65 73 07 00 00 45 4B
-44 31 30 30 30 1B 00 00 4D 6F 64 65 6C 20 43 61
-72 20 45 6E 67 69 6E 65 20 44 65 74 61 69 6C 20
-4B 69 74 04 00 00 38 34 33 35 1F 00 00 43 75 73
-74 6F 6D 20 26 20 43 6F 6D 70 65 74 69 74 69 6F
-6E 20 50 61 72 74 73 20 50 61 63 6B 04 00 00 54
-36 34 32 27 00 00 22 57 69 6E 6E 69 65 20 4D 61
-65 22 20 57 69 6C 65 79 20 50 6F 73 74 27 73 20
-4C 6F 63 6B 68 65 65 64 20 56 65 67 61 06 00 00
-41 69 72 66 69 78 05 00 00 30 34 31 37 36 0C 00
-00 44 48 20 43 6F 6D 65 74 20 34 20 42 07 00 00
-38 35 2D 34 31 36 32 1B 00 00 4F 72 61 6E 67 65
-20 43 72 61 74 65 20 27 33 32 20 46 6F 72 64 20
-53 65 64 61 6E 06 00 00 38 36 30 35 50 4F 14 00
-00 46 69 61 74 20 44 6F 75 62 6C 65 20 44 72 61
-67 73 74 65 72 0B 00 00 42 6C 75 65 70 72 69 6E
-74 65 72 06 00 00 48 2D 31 33 32 31 0C 00 00 47
-72 61 6E 20 54 75 72 69 73 6D 6F 07 00 00 38 35
-2D 37 36 33 37 15 00 00 33 31 20 46 6F 72 64 20
-4D 6F 64 65 6C 20 41 20 57 6F 6F 64 79 03 00 00
-4D 50 43 07 00 00 32 30 30 2D 32 30 30 16 00 00
-47 61 6E 67 62 75 73 74 65 72 73 20 32 38 20 4C
-69 6E 63 6F 6C 6E 07 00 00 38 35 2D 32 35 36 39
-19 00 00 43 68 65 76 79 20 53 2D 31 30 20 4C 6F
-77 72 69 64 65 72 20 33 27 6E 20 31 04 00 00 32
-32 31 31 04 00 00 35 35 30 35 1C 00 00 48 6F 72
-74 65 6E 20 48 6F 20 32 32 39 41 2D 31 20 46 6C
-79 69 6E 67 20 57 69 6E 67 05 00 00 30 35 32 30
-31 1C 00 00 4D 63 44 6F 6E 6E 65 6C 6C 20 58 56
-2D 31 20 43 6F 6E 76 65 72 74 69 70 6C 61 6E 65
-07 00 00 38 35 2D 35 38 31 30 0F 00 00 53 52 2D
-37 31 20 42 6C 61 63 6B 62 69 72 64 04 00 00 34
-35 32 32 19 00 00 4D 65 73 73 65 72 73 63 68 6D
-69 74 74 20 42 66 2D 31 30 39 20 47 2D 31 30 16
-00 00 50 72 65 6D 69 75 6D 2C 20 73 6B 69 6C 6C
-20 6C 65 76 65 6C 20 34 04 00 00 38 36 34 36 0B
-00 00 48 6F 62 62 79 20 43 72 61 66 74 06 00 00
-48 43 31 35 34 39 16 00 00 56 61 6D 70 69 72 65
-20 46 33 20 4A 65 74 20 46 69 67 68 74 65 72 04
-00 00 33 34 30 31 0B 00 00 41 2D 33 36 20 41 70
-61 63 68 65 05 00 00 30 34 33 33 35 15 00 00 42
-6C 6F 68 6D 20 26 20 56 6F 73 73 20 42 56 20 50
-2D 31 39 34 09 00 00 30 31 33 30 4D 30 31 30 30
-34 00 00 43 6F 72 64 20 50 68 61 65 74 6F 6E 20
-53 65 64 61 6E 20 31 39 33 37 20 38 31 32 20 53
-75 70 65 72 63 68 61 72 67 65 64 20 43 6F 6E 76
-65 72 74 69 62 6C 65 07 00 00 38 35 2D 32 35 37
-39 15 00 00 56 57 20 42 65 65 74 6C 65 20 43 6F
-6E 76 65 72 74 69 62 6C 65 04 00 00 37 34 33 38
-10 00 00 42 4D 57 20 5A 2D 31 20 52 6F 61 64 73
-74 65 72 04 00 00 36 31 34 38 0B 00 00 44 69 61
-62 6C 6F 20 41 65 72 6F 0B 00 00 55 6E 69 6F 6E
-20 4D 6F 64 65 6C 2B 00 00 50 65 74 65 20 42 72
-6F 63 6B 27 73 20 53 43 43 41 20 43 68 61 6D 70
-69 6F 6E 20 42 52 45 2F 44 61 74 73 75 6E 20 32
-34 30 2D 5A 05 00 00 32 34 31 32 39 0D 00 00 4A
-61 67 75 61 72 20 58 4A 20 32 32 30 05 00 00 30
-33 31 30 31 13 00 00 53 70 69 72 69 74 20 6F 66
-20 53 74 2E 20 4C 6F 75 69 73 05 00 00 30 36 31
-37 31 15 00 00 4F 72 69 6F 6E 20 32 30 30 31 20
-53 70 61 63 65 63 72 61 66 74 04 00 00 38 37 36
-36 05 00 00 31 2F 36 35 30 18 00 00 53 74 61 72
-20 54 72 65 6B 20 55 2E 53 2E 53 2E 20 52 65 6C
-69 61 6E 74 07 00 00 38 35 2D 31 38 33 35 15 00
-00 4E 41 53 41 2F 4D 63 44 6F 6E 6E 65 6C 6C 20
-47 65 6D 69 6E 69 04 00 00 31 39 39 37 24 00 00
-43 68 61 6E 67 20 5A 68 65 6E 67 20 32 20 28 43
-5A 2D 32 45 29 20 4C 61 75 6E 63 68 20 56 65 68
-69 63 6C 65 05 00 00 31 31 32 31 30 04 00 00 31
-2F 32 30 13 00 00 4D 61 6B 6F 20 53 68 61 72 6B
-20 53 68 6F 77 20 43 61 72 08 00 00 44 72 61 67
-73 74 65 72 08 00 00 4C 6F 77 72 69 64 65 72 04
-00 00 36 30 36 36 2F 00 00 57 69 6C 64 20 57 69
-6C 6C 69 65 20 42 6F 72 73 63 68 20 22 57 69 6E
-67 65 64 20 45 78 70 72 65 73 73 22 20 41 6C 74
-65 72 65 64 20 52 6F 64 04 00 00 36 31 38 32 0F
-00 00 31 39 33 33 20 57 69 6C 6C 79 73 20 56 61
-6E 07 00 00 38 35 2D 30 35 34 30 34 00 00 49 6E
-61 75 67 75 72 61 6C 20 4D 41 54 43 4F 20 54 6F
-6F 6C 73 20 53 75 70 65 72 6E 61 74 69 6F 6E 61
-6C 73 20 4E 69 74 72 6F 20 46 75 6E 6E 79 20 43
-61 72 04 00 00 36 33 35 35 1E 00 00 31 39 35 37
-20 43 68 65 76 72 6F 6C 65 74 20 43 6F 72 76 65
-74 74 65 20 47 61 73 73 65 72 07 00 00 38 35 2D
-37 36 37 35 04 00 00 50 43 36 31 2A 00 00 47 72
-65 65 6E 20 48 6F 72 6E 65 74 20 46 6F 72 64 20
-22 54 22 20 53 68 6F 77 20 61 6E 64 20 47 6F 20
-52 6F 61 64 73 74 65 72 04 00 00 38 32 31 35 18
-00 00 31 39 34 30 20 46 6F 72 64 20 53 65 64 61
-6E 20 44 65 6C 69 76 65 72 79 07 00 00 38 35 2D
-37 36 32 38 16 00 00 33 37 20 46 6F 72 64 20 50
-61 6E 65 6C 20 44 65 6C 69 76 65 72 79 04 00 00
-31 32 39 34 10 00 00 47 79 70 73 79 20 44 75 6E
-65 20 42 75 67 67 79 06 00 00 48 2D 31 32 33 31
-23 00 00 43 68 72 79 73 6C 65 72 20 4E 65 77 20
-59 6F 72 6B 65 72 20 43 75 73 74 6F 6D 69 7A 69
-6E 67 20 4B 69 74 05 00 00 33 30 30 38 31 0E 00
-00 36 32 20 54 68 75 6E 64 65 72 62 69 72 64 04
-00 00 36 38 39 39 11 00 00 31 39 33 32 20 46 6F
-72 64 20 50 68 61 65 74 6F 6E 05 00 00 33 30 32
-37 30 0D 00 00 31 39 36 38 20 50 6C 79 6D 6F 75
-74 68 04 00 00 38 38 34 32 17 00 00 47 72 75 6D
-6D 61 6E 20 46 37 46 2D 33 4E 20 54 69 67 65 72
-63 61 74 04 00 00 48 32 34 34 14 00 00 4D 61 72
-74 69 6E 20 50 36 4D 20 53 65 61 6D 61 73 74 65
-72 04 00 00 35 35 30 30 0E 00 00 42 2D 32 35 48
-20 4D 69 74 63 68 65 6C 6C 04 00 00 33 34 30 32
-0D 00 00 50 2D 35 31 41 20 4D 75 73 74 61 6E 67
-04 00 00 36 34 32 31 3E 00 00 44 61 6D 62 75 73
-74 65 72 20 47 72 61 6E 64 20 53 6C 61 6D 20 42
-6F 6D 62 65 72 20 4C 61 6E 63 61 73 74 65 72 20
-42 49 20 53 70 65 63 69 61 6C 20 32 32 30 30 30
-6C 62 2E 20 42 6F 6D 62 05 00 00 31 34 34 34 33
-1E 00 00 4C 6F 63 6B 68 65 65 64 20 53 75 70 65
-72 2D 47 20 43 6F 6E 73 74 65 6C 6C 61 74 69 6F
-6E 04 00 00 35 36 31 30 13 00 00 57 69 6C 6C 69
-61 6D 73 20 42 72 6F 73 2E 20 49 6E 63 2E 07 00
-00 34 38 2D 33 31 39 31 10 00 00 43 6F 72 62 65
-6E 20 53 75 70 65 72 2D 41 63 65 05 00 00 30 35
-30 30 32 10 00 00 52 65 74 72 69 65 76 65 72 20
-52 6F 63 6B 65 74 03 00 00 43 61 72 04 00 00 38
-35 38 38 1D 00 00 50 6C 79 6D 6F 75 74 68 20 50
-72 6F 77 6C 65 72 20 77 69 74 68 20 54 72 61 69
-6C 65 72 04 00 00 35 30 30 31 14 00 00 43 6F 72
-76 65 74 74 65 20 47 72 61 6E 64 20 53 70 6F 72
-74 04 00 00 37 31 30 38 1D 00 00 43 6F 72 76 65
-74 74 65 20 49 6E 64 79 20 22 44 72 65 61 6D 20
-4D 61 63 68 69 6E 65 22 04 00 00 38 30 35 39 0C
-00 00 54 68 65 20 4D 75 6E 73 74 65 72 73 20 00
-00 42 6C 75 65 70 72 69 6E 74 65 72 3B 20 4D 75
-6E 73 74 65 72 73 20 4B 6F 61 63 68 20 6F 6E 6C
-79 07 00 00 38 35 2D 34 31 36 36 05 00 00 43 6F
-75 6E 74 3C 00 00 77 2F 43 75 74 74 69 6E 67 20
-45 64 67 65 20 43 45 43 34 38 30 38 36 20 48 65
-31 31 31 5A 20 22 5A 77 69 6C 6C 69 6E 67 22 20
-6B 69 74 2C 20 73 6B 69 6C 6C 20 6C 65 76 65 6C
-20 33 07 00 00 38 35 2D 37 36 36 36 23 00 00 43
-75 73 74 6F 6D 20 53 69 6C 76 65 72 61 64 6F 20
-61 6E 64 20 57 61 76 65 72 69 64 65 72 20 42 6F
-61 74 07 00 00 38 35 2D 36 38 35 38 16 00 00 53
-6E 61 6B 65 20 26 20 4D 6F 6E 67 6F 6F 73 65 20
-43 6F 6D 62 6F 07 00 00 38 35 2D 34 31 35 39 24
-00 00 4A 6F 65 20 41 6D 61 74 6F 20 53 75 70 65
-72 6D 61 6E 20 54 6F 70 20 46 75 65 6C 20 44 72
-61 67 73 74 65 72 04 00 00 37 35 34 31 0D 00 00
-53 6B 69 6C 6C 20 6C 65 76 65 6C 20 35 09 00 00
-48 38 32 35 2D 31 30 44 30 28 00 00 43 6F 63 61
-20 43 6F 6C 61 20 46 6F 72 64 20 4C 6F 75 69 73
-76 69 6C 6C 65 20 44 65 6C 69 76 65 72 79 20 54
-72 75 63 6B 07 00 00 38 35 2D 32 31 35 36 04 00
-00 32 39 35 34 0B 00 00 50 6F 72 73 63 68 65 20
-39 30 34 04 00 00 32 39 33 35 25 00 00 4C 61 6D
-62 6F 72 67 68 69 6E 69 20 43 6F 75 6E 74 61 63
-68 20 32 35 74 68 20 41 6E 6E 69 76 65 72 73 61
-72 79 07 00 00 38 35 2D 37 36 31 36 1F 00 00 41
-6D 65 72 69 63 61 6E 20 49 6E 74 65 72 6E 61 74
-69 6F 6E 61 6C 20 44 72 61 67 73 74 65 72 07 00
-00 38 35 2D 35 32 34 31 0D 00 00 50 2D 35 31 44
-20 4D 75 73 74 61 6E 67 07 00 00 38 35 2D 35 37
-31 30 11 00 00 52 42 2D 33 36 48 20 50 65 61 63
-65 6D 61 6B 65 72 05 00 00 30 35 31 30 34 14 00
-00 52 65 70 75 62 6C 69 63 20 52 43 2E 33 20 53
-65 61 62 65 65 05 00 00 50 41 31 35 32 05 00 00
-36 31 30 36 36 25 00 00 44 65 48 61 76 69 6C 6C
-61 6E 64 20 4D 6F 73 71 75 69 74 6F 20 42 20 4D
-6B 2E 49 56 2F 50 52 20 4D 6B 2E 49 56 07 00 00
-38 35 2D 37 35 34 36 10 00 00 50 2D 36 31 20 42
-6C 61 63 6B 20 57 69 64 6F 77 07 00 00 38 35 2D
-36 36 35 32 25 00 00 42 2D 31 37 46 20 46 6C 79
-69 6E 67 20 46 6F 72 74 72 65 73 73 20 22 4D 65
-6D 70 68 69 73 20 42 65 6C 6C 65 22 04 00 00 37
-35 30 30 0D 00 00 47 61 74 65 73 20 4C 65 61 72
-6A 65 74 03 00 00 35 31 39 15 00 00 47 72 75 6D
-6D 61 6E 20 46 38 46 2D 32 20 42 65 61 72 63 61
-74 04 00 00 37 35 32 33 12 00 00 46 2D 31 30 34
-43 20 53 74 61 72 66 69 67 68 74 65 72 05 00 00
-36 31 30 37 30 15 00 00 56 6F 75 67 68 74 20 46
-34 55 2D 31 41 20 43 6F 72 73 61 69 72 07 00 00
-38 35 2D 37 36 36 34 19 00 00 42 61 6C 64 77 69
-6E 2D 4D 6F 74 69 6F 6E 20 44 72 61 67 20 43 6F
-62 72 61 04 00 00 38 34 35 35 14 00 00 35 37 20
-43 68 65 76 72 6F 6C 65 74 20 42 65 6C 20 41 69
-72 16 00 00 50 72 6F 53 68 6F 70 2C 20 73 6B 69
-6C 6C 20 6C 65 76 65 6C 20 33 05 00 00 33 30 30
-35 32 0D 00 00 34 31 20 46 6F 72 64 20 57 6F 6F
-64 79 07 00 00 38 35 2D 32 35 35 37 19 00 00 36
-30 20 43 68 65 76 79 20 48 61 72 64 74 6F 70 20
-4C 6F 77 72 69 64 65 72 07 00 00 38 35 2D 37 36
-33 38 09 00 00 41 65 72 6F 76 65 74 74 65 07 00
-00 38 35 2D 30 30 39 34 1B 00 00 4C 69 27 6C 20
-43 6F 66 66 69 6E 20 43 75 73 74 6F 6D 20 53 68
-6F 77 20 52 6F 64 04 00 00 38 32 39 30 0A 00 00
-53 27 43 6F 6F 6C 20 42 75 73 07 00 00 38 35 2D
-32 35 39 37 12 00 00 53 74 72 65 65 74 20 46 69
-67 68 74 65 72 20 54 77 6F 04 00 00 37 36 30 39
-12 00 00 54 68 61 6D 65 73 20 50 61 6E 65 6C 20
-54 72 75 63 6B 07 00 00 38 35 2D 37 36 30 36 15
-00 00 44 61 6E 20 46 69 6E 6B 27 73 20 53 70 65
-65 64 77 61 67 6F 6E 05 00 00 30 35 35 30 35 1A
-00 00 4D 61 72 74 69 6E 20 4D 2D 31 33 30 20 43
-68 69 6E 61 20 43 6C 69 70 70 65 72 07 00 00 38
-35 2D 30 30 31 35 0E 00 00 46 6F 72 64 20 54 72
-69 2D 4D 6F 74 6F 72 04 00 00 50 41 33 30 1A 00
-00 57 72 69 67 68 74 20 42 72 6F 74 68 65 72 73
-20 4B 69 74 74 79 20 48 61 77 6B 07 00 00 38 35
-2D 35 30 38 31 13 00 00 46 69 72 73 74 20 4C 75
-6E 61 72 20 4C 61 6E 64 69 6E 67 07 00 00 38 35
-2D 35 38 33 39 18 00 00 4D 65 73 73 65 72 73 63
-68 6D 69 74 74 20 42 66 20 31 31 30 20 47 2D 32
-04 00 00 43 48 34 31 04 00 00 4A 30 30 34 05 00
-00 4A 54 31 32 33 04 00 00 4A 54 32 32 04 00 00
-4A 54 37 31 04 00 00 53 50 36 33 04 00 00 42 54
-31 36 0C 00 00 4F 56 2D 31 42 20 4D 6F 68 61 77
-6B 03 00 00 30 36 38 0B 00 00 56 2D 32 32 20 4F
-73 70 72 65 79 04 00 00 38 36 31 35 13 00 00 58
-2F 59 42 2D 33 35 20 46 6C 79 69 6E 67 20 57 69
-6E 67 05 00 00 31 31 32 30 38 1B 00 00 31 39 33
-33 20 43 61 64 69 6C 6C 61 63 20 56 2D 31 36 20
-54 6F 77 6E 20 43 61 72 04 00 00 36 36 31 38 27
-00 00 53 74 61 72 20 54 72 65 6B 20 33 20 50 69
-65 63 65 20 55 2E 53 2E 53 2E 20 45 6E 74 65 72
-70 72 69 73 65 20 53 65 74 12 00 00 4D 69 73 73
-69 6E 67 20 54 56 20 76 65 72 73 69 6F 6E 04 00
-00 38 39 31 35 0E 00 00 53 74 61 72 20 44 65 73
-74 72 6F 79 65 72 04 00 00 38 31 39 33 0A 00 00
-44 65 61 74 68 20 53 74 61 72 08 00 00 53 6E 61
-70 54 69 74 65 07 00 00 38 35 2D 33 36 32 31 07
-00 00 38 35 2D 33 36 32 32 17 00 00 42 61 62 79
-6C 6F 6E 20 35 20 53 70 61 63 65 20 53 74 61 74
-69 6F 6E 04 00 00 36 38 35 38 1F 00 00 53 74 61
-72 20 54 72 65 6B 20 33 20 50 69 65 63 65 20 41
-64 76 65 72 73 61 72 79 20 53 65 74 04 00 00 38
-37 36 32 06 00 00 31 2F 31 30 30 30 29 00 00 53
-74 61 72 20 54 72 65 6B 20 47 65 6E 65 72 61 74
-69 6F 6E 73 20 55 2E 53 2E 53 2E 20 45 6E 74 65
-72 70 72 69 73 65 20 42 04 00 00 38 38 38 33 03
-00 00 31 2F 34 05 00 00 4F 74 68 65 72 12 00 00
-56 69 73 69 62 6C 65 20 56 2D 38 20 45 6E 67 69
-6E 65 04 00 00 37 31 32 30 1C 00 00 31 39 36 39
-20 50 6F 6E 74 69 61 63 20 47 54 4F 20 22 54 68
-65 20 4A 75 64 67 65 22 09 00 00 31 2F 32 34 2D
-31 2F 32 35 05 00 00 31 2F 31 33 30 05 00 00 31
-2F 35 37 30 05 00 00 54 6F 20 64 6F 33 00 00 47
-75 73 20 47 72 69 73 73 6F 6D 20 4D 65 6D 6F 72
-69 61 6C 20 43 6F 6D 62 6F 20 77 2F 54 77 6F 20
-43 6F 6C 6C 65 63 74 6F 72 73 20 50 61 74 63 68
-65 73 09 00 00 46 69 72 65 20 49 72 6F 6E 0C 00
-00 77 2F 64 65 74 61 69 6C 20 73 65 74 2C 00 00
-77 2F 64 65 74 61 69 6C 20 73 65 74 20 61 6E 64
-20 69 6E 74 65 72 69 6F 72 20 73 65 74 2C 20 72
-65 73 69 6E 20 65 6E 67 69 6E 65 73 03 00 00 49
-43 4D 0E 00 00 53 70 69 74 66 69 72 65 20 4D 6B
-2E 49 58 1A 00 00 4D 65 73 73 65 72 73 63 68 6D
-69 74 74 20 4D 65 20 34 31 30 42 2D 32 2F 55 34
-0A 00 00 4D 6F 64 65 6C 63 72 61 66 74 12 00 00
-46 2D 38 32 42 20 54 77 69 6E 20 4D 75 73 74 61
-6E 67 1F 00 00 31 39 35 33 20 53 74 75 64 65 62
-61 6B 65 72 20 53 74 61 72 6C 69 6E 65 72 20 43
-6F 75 70 65 04 00 00 32 34 33 36 0E 00 00 42 75
-67 61 74 74 69 20 45 42 20 31 31 30 2D 00 00 53
-74 61 72 20 54 72 65 6B 20 4B 6C 69 6E 67 6F 6E
-20 42 69 72 64 20 6F 66 20 50 72 65 79 20 46 6C
-69 67 68 74 20 44 69 73 70 6C 61 79 16 00 00 50
-6F 72 73 63 68 65 20 39 31 31 20 53 6C 61 6E 74
-20 4E 6F 73 65 05 00 00 36 31 30 37 33 25 00 00
-44 6F 75 67 6C 61 73 20 41 2D 31 4A 20 53 6B 79
-72 61 69 64 65 72 20 55 2E 53 2E 20 41 69 72 20
-46 6F 72 63 65 04 00 00 36 33 33 39 04 00 00 36
-39 35 35 04 00 00 37 35 33 30 06 00 00 34 38 2D
-30 32 30 05 00 00 31 2F 34 35 30 0F 00 00 55 2E
-53 2E 53 2E 20 4D 69 73 73 6F 75 72 69 05 00 00
-36 31 30 35 37 15 00 00 48 65 69 6E 6B 65 6C 20
-48 65 32 31 39 20 41 2D 37 20 55 48 55 05 00 00
-36 31 30 34 31 05 00 00 31 31 36 32 34 32 00 00
-43 6F 6E 73 6F 6C 69 64 61 74 65 64 20 42 2D 32
-34 4A 20 4C 69 62 65 72 61 74 6F 72 20 54 68 65
-20 44 72 61 67 6F 6E 20 26 20 48 69 73 20 54 61
-69
+FC 00 20
+20 B8 05 00 00 B0 02 00 00 0C 00 00 4D 61 6E 75
+66 61 63 74 75 72 65 72 0B 00 00 50 61 72 74 20
+4E 75 6D 62 65 72 05 00 00 53 63 61 6C 65 04 00
+00 54 79 70 65 04 00 00 4E 61 6D 65 08 00 00 43
+6F 6D 6D 65 6E 74 73 08 00 00 41 4D 54 2D 45 52
+54 4C 07 00 00 48 6F 74 20 52 6F 64 10 00 00 33
+32 20 46 6F 72 64 20 52 6F 61 64 73 74 65 72 08
+00 00 4D 6F 6E 6F 67 72 61 6D 08 00 00 53 68 6F
+77 20 52 6F 64 07 00 00 48 61 6E 67 6D 61 6E 11
+00 00 50 65 74 65 72 62 69 6C 74 20 57 72 65 63
+6B 65 72 15 00 00 45 61 73 74 65 72 6E 20 41 69
+72 6C 69 6E 65 73 20 44 43 2D 33 11 00 00 4D 61
+73 65 72 61 74 69 20 4D 65 72 61 6B 20 53 53 1A
+00 00 44 6F 75 67 6C 61 73 20 50 2D 37 30 20 4E
+69 67 68 74 20 46 69 67 68 74 65 72 17 00 00 35
+35 20 43 68 65 76 79 20 53 74 72 65 65 74 20 4D
+61 63 68 69 6E 65 0C 00 00 54 77 65 65 64 79 20
+50 69 65 20 32 13 00 00 48 75 65 79 20 52 65 73
+63 75 65 20 43 68 6F 70 70 65 72 10 00 00 4D 61
+7A 64 61 20 4D 58 2D 35 20 4D 69 61 74 61 0A 00
+00 53 70 6F 72 74 73 20 43 61 72 05 00 00 54 72
+75 63 6B 06 00 00 52 6F 63 6B 65 74 09 00 00 50
+61 72 74 73 20 4B 69 74 0E 00 00 43 69 76 69 6C
+69 61 6E 20 50 6C 61 6E 65 0E 00 00 4D 69 6C 69
+74 61 72 79 20 50 6C 61 6E 65 0F 00 00 53 63 69
+65 6E 63 65 20 46 69 63 74 69 6F 6E 1A 00 00 44
+6F 6E 20 47 61 72 6C 69 74 73 20 57 79 6E 6E 27
+73 20 43 68 61 72 67 65 72 19 00 00 44 6F 6E 20
+47 61 72 6C 69 74 73 20 57 79 6E 6E 27 73 20 4A
+61 6D 6D 65 72 1A 00 00 50 61 63 6B 61 72 64 20
+42 6F 61 74 74 61 69 6C 20 53 70 65 65 64 73 74
+65 72 0E 00 00 52 65 76 65 6C 6C 20 47 65 72 6D
+61 6E 79 05 00 00 30 34 31 34 36 04 00 00 31 2F
+32 34 04 00 00 31 2F 37 32 0E 00 00 4D 65 20 32
+36 32 20 41 2D 31 61 2F 55 33 09 00 00 53 54 43
+20 53 74 61 72 74 04 00 00 34 63 2D 39 05 00 00
+31 2F 32 38 38 0C 00 00 50 72 6F 74 6F 6E 2D 4B
+20 4D 69 72 04 00 00 34 63 2D 37 0E 00 00 50 72
+6F 74 6F 6E 2D 4B 20 41 73 74 72 61 05 00 00 34
+63 2D 31 37 0E 00 00 50 72 6F 74 6F 6E 2D 4B 20
+5A 61 72 79 61 13 00 00 41 63 63 75 72 61 74 65
+20 4D 69 6E 69 61 74 75 72 65 73 04 00 00 33 34
+32 30 04 00 00 31 2F 34 38 0F 00 00 53 42 44 2D
+31 20 44 61 75 6E 74 6C 65 73 73 1B 00 00 77 2F
+56 65 72 6C 69 6E 64 65 6E 20 31 33 37 38 20 44
+65 74 61 69 6C 20 53 65 74 04 00 00 38 32 38 33
+0C 00 00 54 72 6F 75 62 6C 65 6D 61 6B 65 72 04
+00 00 32 37 33 37 0E 00 00 44 61 79 74 6F 6E 61
+20 53 70 69 64 65 72 04 00 00 38 31 32 36 04 00
+00 31 2F 32 35 06 00 00 48 65 6C 6C 65 72 05 00
+00 38 30 34 34 33 05 00 00 31 2F 31 34 34 12 00
+00 42 72 65 69 74 6C 69 6E 20 4F 72 62 69 74 65
+72 20 33 0F 00 00 53 68 61 6E 67 68 61 69 20 44
+72 61 67 6F 6E 04 00 00 31 39 39 38 04 00 00 31
+2F 39 36 0F 00 00 41 72 69 61 6E 65 20 35 20 52
+6F 63 6B 65 74 0F 00 00 52 65 76 65 6C 6C 2D 4D
+6F 6E 6F 67 72 61 6D 07 00 00 38 35 2D 35 39 33
+34 0F 00 00 50 42 59 2D 35 41 20 43 61 74 61 6C
+69 6E 61 0A 00 00 50 72 6F 4D 6F 64 65 6C 65 72
+07 00 00 47 6C 65 6E 63 6F 65 05 00 00 30 35 32
+30 32 04 00 00 31 2F 33 35 16 00 00 50 69 61 73
+65 63 6B 69 20 5A 56 2D 38 50 20 41 69 72 67 65
+65 70 08 00 00 48 61 73 65 67 61 77 61 05 00 00
+30 39 31 36 39 20 00 00 53 42 44 2D 33 20 44 61
+75 6E 74 6C 65 73 73 20 27 55 53 53 20 45 6E 74
+65 72 70 72 69 73 65 27 0C 00 00 53 69 6C 76 65
+72 20 43 6C 6F 75 64 06 00 00 53 43 34 38 30 31
+19 00 00 53 75 70 65 72 6D 61 72 69 6E 65 20 53
+70 69 74 65 66 75 6C 20 46 2E 31 34 06 00 00 52
+65 76 65 6C 6C 07 00 00 38 35 2D 31 36 35 34 0D
+00 00 50 2D 35 31 42 20 4D 75 73 74 61 6E 67 09
+00 00 50 72 6F 46 69 6E 69 73 68 06 00 00 44 72
+61 67 6F 6E 04 00 00 35 39 30 31 0B 00 00 46 6F
+6B 6B 65 72 20 44 72 2E 31 07 00 00 49 74 61 6C
+65 72 69 03 00 00 38 34 36 25 00 00 43 2D 31 33
+30 4A 20 48 65 72 63 75 6C 65 73 20 48 65 61 76
+79 20 54 72 61 6E 73 70 6F 72 74 20 50 6C 61 6E
+65 04 00 00 37 36 31 30 15 00 00 46 65 72 72 61
+72 69 20 46 35 30 20 42 61 72 63 68 65 74 74 61
+03 00 00 41 4D 54 08 00 00 54 33 37 34 2D 32 32
+35 0D 00 00 43 6F 72 76 61 69 72 20 4D 6F 6E 7A
+61 04 00 00 35 30 30 33 0B 00 00 4D 63 4C 61 72
+65 6E 20 4D 38 42 0D 00 00 52 65 76 65 6C 6C 20
+4C 6F 64 65 6C 61 05 00 00 48 2D 32 36 33 03 00
+00 75 6E 6B 23 00 00 42 6F 65 69 6E 67 20 53 53
+54 20 50 61 6E 41 6D 20 43 6C 69 70 70 65 72 20
+53 75 70 65 72 73 6F 6E 69 63 05 00 00 30 35 39
+30 39 05 00 00 31 2F 33 30 30 1D 00 00 4E 75 63
+6C 65 61 72 20 50 6F 77 65 72 65 64 20 53 70 61
+63 65 20 53 74 61 74 69 6F 6E 04 00 00 38 37 36
+34 06 00 00 31 2F 32 35 30 30 19 00 00 53 74 61
+72 20 54 72 65 6B 20 44 65 65 70 20 53 70 61 63
+65 20 4E 69 6E 65 23 00 00 46 69 62 65 72 2D 6F
+70 74 69 63 20 4C 69 67 68 74 69 6E 67 2C 20 73
+6B 69 6C 6C 20 6C 65 76 65 6C 20 33 0D 00 00 53
+6B 69 6C 6C 20 6C 65 76 65 6C 20 33 04 00 00 38
+31 35 38 16 00 00 42 6C 75 65 70 72 69 6E 74 65
+72 20 50 61 72 74 73 20 50 61 63 6B 13 00 00 45
+6E 67 69 6E 65 73 20 61 6E 64 20 67 72 69 6C 6C
+65 73 05 00 00 33 30 30 33 37 05 00 00 31 2F 32
+30 30 1E 00 00 4D 61 6E 20 49 6E 20 53 70 61 63
+65 20 52 6F 63 6B 65 74 20 43 6F 6C 6C 65 63 74
+69 6F 6E 53 00 00 4D 65 72 63 75 72 79 20 41 74
+6C 61 73 2C 20 4D 65 72 63 75 72 79 20 52 65 64
+73 74 6F 6E 65 2C 20 47 65 6D 69 6E 69 20 54 69
+74 61 6E 20 49 49 2C 20 53 61 74 75 72 6E 20 31
+42 20 41 70 6F 6C 6C 6F 2C 20 53 61 74 75 72 6E
+20 56 20 41 70 6F 6C 6C 6F 04 00 00 35 30 38 33
+04 00 00 31 2F 33 32 11 00 00 41 70 6F 6C 6C 6F
+20 53 70 61 63 65 63 72 61 66 74 09 00 00 4D 69
+6E 69 63 72 61 66 74 05 00 00 31 31 32 32 30 04
+00 00 31 2F 31 36 24 00 00 31 39 35 35 20 4D 65
+72 63 65 64 65 73 20 33 30 30 53 4C 20 22 47 75
+6C 6C 77 69 6E 67 22 20 43 6F 75 70 65 07 00 00
+38 35 2D 36 38 35 39 24 00 00 4D 75 73 74 61 6E
+67 20 4D 75 73 63 6C 65 20 54 72 69 6F 20 27 36
+30 73 2C 20 27 37 30 73 2C 20 27 38 30 73 35 00
+00 31 39 36 34 20 31 2F 32 20 43 6F 6E 76 65 72
+74 69 62 6C 65 2C 20 31 39 37 30 20 42 6F 73 73
+20 33 30 32 2C 20 31 39 38 39 20 43 6F 6E 76 65
+72 74 69 62 6C 65 06 00 00 54 61 6D 69 79 61 05
+00 00 32 34 31 37 30 0A 00 00 4D 6F 72 67 61 6E
+20 34 2F 34 07 00 00 38 35 2D 32 34 39 31 11 00
+00 36 37 20 43 6F 72 76 65 74 74 65 20 43 6F 75
+70 65 07 00 00 38 35 2D 32 35 33 34 0F 00 00 53
+68 65 6C 62 79 20 53 65 72 69 65 73 20 31 03 00
+00 35 36 32 11 00 00 41 73 74 6F 6E 20 4D 61 72
+74 69 6E 20 44 42 20 34 05 00 00 30 37 33 32 30
+13 00 00 50 6F 72 73 63 68 65 20 39 31 31 20 43
+61 72 72 65 72 61 07 00 00 54 65 73 74 6F 72 73
+03 00 00 33 38 36 04 00 00 32 39 37 32 16 00 00
+4D 65 72 63 65 64 65 73 20 33 30 30 20 53 4C 52
+20 22 37 32 32 22 08 00 00 4C 69 6E 64 62 65 72
+67 05 00 00 37 30 39 35 36 19 00 00 48 65 6C 6C
+63 61 74 73 20 76 73 2E 20 42 65 74 74 79 20 42
+6F 6D 62 65 72 0C 00 00 48 65 6C 6C 63 61 74 20
+6F 6E 6C 79 05 00 00 30 34 36 30 39 18 00 00 45
+6B 72 61 6E 6F 70 6C 61 6E 20 41 2D 39 30 20 4F
+72 6C 6A 6F 6E 6F 6B 05 00 00 31 31 36 32 36 18
+00 00 47 72 75 6D 6D 61 6E 20 58 46 35 46 2D 31
+20 53 6B 79 72 6F 63 6B 65 74 04 00 00 35 34 32
+30 0E 00 00 48 61 77 6B 65 72 20 48 61 72 72 69
+65 72 05 00 00 41 56 2D 38 41 06 00 00 65 64 75
+61 72 64 04 00 00 38 30 36 31 0F 00 00 50 2D 34
+30 30 20 41 69 72 61 63 6F 62 72 61 0B 00 00 43
+7A 65 63 68 20 4D 6F 64 65 6C 04 00 00 34 38 30
+36 16 00 00 43 75 72 74 69 73 73 20 58 50 2D 35
+35 20 41 73 63 65 6E 64 65 72 05 00 00 36 31 30
+37 34 14 00 00 44 6F 72 6E 69 65 72 20 44 6F 33
+33 35 41 20 50 66 69 65 6C 13 00 00 4B 79 75 73
+68 75 20 4A 37 57 31 20 53 68 69 6E 64 65 6E 0D
+00 00 50 6C 61 6E 65 74 20 4D 6F 64 65 6C 73 03
+00 00 30 34 33 0F 00 00 48 65 6E 73 63 68 65 6C
+20 48 73 20 50 38 37 05 00 00 52 65 73 69 6E 0D
+00 00 53 70 65 63 69 61 6C 20 48 6F 62 62 79 08
+00 00 53 48 20 34 38 30 30 33 16 00 00 4D 63 44
+6F 6E 6E 65 6C 6C 20 58 46 2D 38 35 20 47 6F 62
+6C 69 6E 2A 00 00 4D 65 73 73 65 72 73 63 68 6D
+69 74 74 20 42 66 31 30 39 45 20 27 42 75 6C 67
+61 72 69 61 6E 20 41 69 72 20 46 6F 72 63 65 27
+05 00 00 30 34 32 30 36 2D 00 00 41 69 72 62 75
+73 20 53 75 70 65 72 20 54 72 61 6E 73 70 6F 72
+74 65 72 20 41 33 30 30 2D 36 30 30 20 53 54 20
+22 42 65 6C 75 67 61 22 05 00 00 33 30 30 38 37
+0C 00 00 33 39 20 57 61 67 6F 6E 20 52 6F 64 04
+00 00 37 31 32 31 1A 00 00 31 39 33 32 20 46 6F
+72 64 20 48 69 67 68 62 6F 79 20 52 6F 61 64 73
+74 65 72 2E 00 00 4C 69 6E 63 6F 6C 6E 20 4D 69
+6E 74 20 55 6C 74 72 61 20 4D 65 74 61 6C 20 53
+65 72 69 65 73 2C 20 53 6B 69 6C 6C 20 6C 65 76
+65 6C 20 33 0C 00 00 50 6F 6C 61 72 20 4C 69 67
+68 74 73 04 00 00 35 30 31 34 21 00 00 43 61 72
+6C 20 43 61 73 70 65 72 27 73 20 55 6E 64 65 72
+74 61 6B 65 72 20 44 72 61 67 73 74 65 72 07 00
+00 38 35 2D 32 35 39 32 20 00 00 33 39 20 43 68
+65 76 79 20 53 65 64 61 6E 20 44 65 6C 69 76 65
+72 79 20 4C 6F 77 72 69 64 65 72 07 00 00 38 35
+2D 35 39 30 34 12 00 00 4E 41 53 41 20 53 70 61
+63 65 20 53 68 75 74 74 6C 65 04 00 00 32 34 30
+30 1C 00 00 31 39 32 36 20 4D 61 63 6B 20 42 75
+6C 6C 64 6F 67 20 44 75 6D 70 20 54 72 75 63 6B
+05 00 00 43 31 31 32 38 13 00 00 32 33 20 54 20
+52 6F 61 64 73 74 65 72 20 46 72 61 6D 65 05 00
+00 33 31 32 31 36 11 00 00 44 6F 64 67 65 20 56
+69 70 65 72 20 52 54 2D 31 30 07 00 00 50 72 6F
+53 68 6F 70 04 00 00 32 33 30 31 05 00 00 31 31
+32 31 32 26 00 00 31 39 33 35 20 4D 6F 72 67 61
+6E 20 53 75 70 65 72 20 53 70 6F 72 74 73 20 54
+68 72 65 65 20 57 68 65 65 6C 65 72 0C 00 00 47
+75 6E 7A 65 20 53 61 6E 67 79 6F 13 00 00 54 72
+69 75 6D 70 68 20 54 52 32 20 4C 65 20 4D 61 6E
+73 07 00 00 38 35 2D 31 39 31 31 0F 00 00 33 34
+20 46 6F 72 64 20 48 69 67 68 62 6F 79 17 00 00
+57 68 65 65 6C 73 20 6F 66 20 46 69 72 65 20 53
+6E 61 70 54 69 74 65 06 00 00 4A 6F 2D 48 61 6E
+06 00 00 47 43 2D 33 30 30 20 00 00 43 68 72 79
+73 6C 65 72 20 43 6F 72 70 6F 72 61 74 69 6F 6E
+20 54 75 72 62 69 6E 65 20 43 61 72 09 00 00 48
+31 32 38 35 3A 31 39 38 2B 00 00 54 6F 6D 6D 79
+20 49 76 6F 27 73 20 46 6F 75 72 20 45 6E 67 69
+6E 65 20 44 72 61 67 73 74 65 72 20 22 53 68 6F
+77 62 6F 61 74 22 09 00 00 48 31 32 32 34 3A 32
+30 30 17 00 00 32 32 20 4A 52 20 52 6F 61 64 73
+74 65 72 20 44 72 61 67 73 74 65 72 0F 00 00 32
+20 63 6F 6D 70 6C 65 74 65 20 63 61 72 73 04 00
+00 36 34 33 35 04 00 00 36 34 33 38 07 00 00 38
+35 2D 37 36 36 38 0F 00 00 34 31 20 43 68 65 76
+79 20 50 69 63 6B 75 70 04 00 00 36 35 38 35 17
+00 00 42 61 62 79 6C 6F 6E 20 35 20 53 74 61 72
+66 75 72 79 20 4D 6B 2E 31 1C 00 00 4D 65 73 73
+65 72 73 63 68 6D 69 74 74 20 42 66 31 30 39 45
+20 47 61 6C 6C 61 6E 64 05 00 00 36 31 30 36 37
+1B 00 00 42 72 69 73 74 6F 6C 20 42 65 61 75 66
+69 67 68 74 65 72 20 54 46 2E 4D 6B 2E 58 12 00
+00 48 65 6E 73 63 68 65 6C 20 48 73 20 31 32 39
+42 2D 32 04 00 00 33 34 31 39 0D 00 00 50 2D 35
+31 43 20 4D 75 73 74 61 6E 67 07 00 00 38 35 2D
+35 35 30 39 1B 00 00 48 65 69 6E 6B 65 6C 20 48
+65 31 31 31 20 47 65 72 6D 61 6E 20 42 6F 6D 62
+65 72 11 00 00 41 63 61 64 65 6D 79 20 4D 69 6E
+69 63 72 61 66 74 04 00 00 32 31 34 35 1E 00 00
+4C 6F 63 6B 68 65 65 64 20 50 2D 33 38 4D 20 4E
+69 67 68 74 20 4C 69 67 68 74 6E 69 6E 67 07 00
+00 38 35 2D 30 31 33 35 11 00 00 4F 53 32 55 2D
+33 20 4B 69 6E 67 66 69 73 68 65 72 3B 00 00 41
+69 63 68 69 20 42 37 41 32 20 41 74 74 61 63 6B
+20 42 6F 6D 62 65 72 20 20 52 79 75 73 65 69 20
+4B 61 69 20 28 47 72 61 63 65 29 20 27 46 6F 6C
+64 69 6E 67 20 57 69 6E 67 27 15 00 00 58 46 35
+55 2D 31 20 46 6C 79 69 6E 67 20 50 61 6E 63 61
+6B 65 04 00 00 36 37 35 37 07 00 00 49 63 65 20
+27 54 27 07 00 00 38 35 2D 35 31 30 32 04 00 00
+53 68 69 70 15 00 00 55 2E 53 2E 53 2E 20 4E 6F
+72 74 68 20 43 61 72 6F 6C 69 6E 61 0E 00 00 50
+61 72 74 73 20 62 79 20 50 61 72 6B 73 04 00 00
+31 30 30 34 0F 00 00 44 69 73 74 72 69 62 75 74
+6F 72 20 4B 69 74 12 00 00 50 53 46 20 4D 6F 64
+65 6C 20 53 75 70 70 6C 69 65 73 07 00 00 45 4B
+44 31 30 30 30 1B 00 00 4D 6F 64 65 6C 20 43 61
+72 20 45 6E 67 69 6E 65 20 44 65 74 61 69 6C 20
+4B 69 74 04 00 00 38 34 33 35 1F 00 00 43 75 73
+74 6F 6D 20 26 20 43 6F 6D 70 65 74 69 74 69 6F
+6E 20 50 61 72 74 73 20 50 61 63 6B 04 00 00 54
+36 34 32 27 00 00 22 57 69 6E 6E 69 65 20 4D 61
+65 22 20 57 69 6C 65 79 20 50 6F 73 74 27 73 20
+4C 6F 63 6B 68 65 65 64 20 56 65 67 61 06 00 00
+41 69 72 66 69 78 05 00 00 30 34 31 37 36 0C 00
+00 44 48 20 43 6F 6D 65 74 20 34 20 42 07 00 00
+38 35 2D 34 31 36 32 1B 00 00 4F 72 61 6E 67 65
+20 43 72 61 74 65 20 27 33 32 20 46 6F 72 64 20
+53 65 64 61 6E 06 00 00 38 36 30 35 50 4F 14 00
+00 46 69 61 74 20 44 6F 75 62 6C 65 20 44 72 61
+67 73 74 65 72 0B 00 00 42 6C 75 65 70 72 69 6E
+74 65 72 06 00 00 48 2D 31 33 32 31 0C 00 00 47
+72 61 6E 20 54 75 72 69 73 6D 6F 07 00 00 38 35
+2D 37 36 33 37 15 00 00 33 31 20 46 6F 72 64 20
+4D 6F 64 65 6C 20 41 20 57 6F 6F 64 79 03 00 00
+4D 50 43 07 00 00 32 30 30 2D 32 30 30 16 00 00
+47 61 6E 67 62 75 73 74 65 72 73 20 32 38 20 4C
+69 6E 63 6F 6C 6E 07 00 00 38 35 2D 32 35 36 39
+19 00 00 43 68 65 76 79 20 53 2D 31 30 20 4C 6F
+77 72 69 64 65 72 20 33 27 6E 20 31 04 00 00 32
+32 31 31 04 00 00 35 35 30 35 1C 00 00 48 6F 72
+74 65 6E 20 48 6F 20 32 32 39 41 2D 31 20 46 6C
+79 69 6E 67 20 57 69 6E 67 05 00 00 30 35 32 30
+31 1C 00 00 4D 63 44 6F 6E 6E 65 6C 6C 20 58 56
+2D 31 20 43 6F 6E 76 65 72 74 69 70 6C 61 6E 65
+07 00 00 38 35 2D 35 38 31 30 0F 00 00 53 52 2D
+37 31 20 42 6C 61 63 6B 62 69 72 64 04 00 00 34
+35 32 32 19 00 00 4D 65 73 73 65 72 73 63 68 6D
+69 74 74 20 42 66 2D 31 30 39 20 47 2D 31 30 16
+00 00 50 72 65 6D 69 75 6D 2C 20 73 6B 69 6C 6C
+20 6C 65 76 65 6C 20 34 04 00 00 38 36 34 36 0B
+00 00 48 6F 62 62 79 20 43 72 61 66 74 06 00 00
+48 43 31 35 34 39 16 00 00 56 61 6D 70 69 72 65
+20 46 33 20 4A 65 74 20 46 69 67 68 74 65 72 04
+00 00 33 34 30 31 0B 00 00 41 2D 33 36 20 41 70
+61 63 68 65 05 00 00 30 34 33 33 35 15 00 00 42
+6C 6F 68 6D 20 26 20 56 6F 73 73 20 42 56 20 50
+2D 31 39 34 09 00 00 30 31 33 30 4D 30 31 30 30
+34 00 00 43 6F 72 64 20 50 68 61 65 74 6F 6E 20
+53 65 64 61 6E 20 31 39 33 37 20 38 31 32 20 53
+75 70 65 72 63 68 61 72 67 65 64 20 43 6F 6E 76
+65 72 74 69 62 6C 65 07 00 00 38 35 2D 32 35 37
+39 15 00 00 56 57 20 42 65 65 74 6C 65 20 43 6F
+6E 76 65 72 74 69 62 6C 65 04 00 00 37 34 33 38
+10 00 00 42 4D 57 20 5A 2D 31 20 52 6F 61 64 73
+74 65 72 04 00 00 36 31 34 38 0B 00 00 44 69 61
+62 6C 6F 20 41 65 72 6F 0B 00 00 55 6E 69 6F 6E
+20 4D 6F 64 65 6C 2B 00 00 50 65 74 65 20 42 72
+6F 63 6B 27 73 20 53 43 43 41 20 43 68 61 6D 70
+69 6F 6E 20 42 52 45 2F 44 61 74 73 75 6E 20 32
+34 30 2D 5A 05 00 00 32 34 31 32 39 0D 00 00 4A
+61 67 75 61 72 20 58 4A 20 32 32 30 05 00 00 30
+33 31 30 31 13 00 00 53 70 69 72 69 74 20 6F 66
+20 53 74 2E 20 4C 6F 75 69 73 05 00 00 30 36 31
+37 31 15 00 00 4F 72 69 6F 6E 20 32 30 30 31 20
+53 70 61 63 65 63 72 61 66 74 04 00 00 38 37 36
+36 05 00 00 31 2F 36 35 30 18 00 00 53 74 61 72
+20 54 72 65 6B 20 55 2E 53 2E 53 2E 20 52 65 6C
+69 61 6E 74 07 00 00 38 35 2D 31 38 33 35 15 00
+00 4E 41 53 41 2F 4D 63 44 6F 6E 6E 65 6C 6C 20
+47 65 6D 69 6E 69 04 00 00 31 39 39 37 24 00 00
+43 68 61 6E 67 20 5A 68 65 6E 67 20 32 20 28 43
+5A 2D 32 45 29 20 4C 61 75 6E 63 68 20 56 65 68
+69 63 6C 65 05 00 00 31 31 32 31 30 04 00 00 31
+2F 32 30 13 00 00 4D 61 6B 6F 20 53 68 61 72 6B
+20 53 68 6F 77 20 43 61 72 08 00 00 44 72 61 67
+73 74 65 72 08 00 00 4C 6F 77 72 69 64 65 72 04
+00 00 36 30 36 36 2F 00 00 57 69 6C 64 20 57 69
+6C 6C 69 65 20 42 6F 72 73 63 68 20 22 57 69 6E
+67 65 64 20 45 78 70 72 65 73 73 22 20 41 6C 74
+65 72 65 64 20 52 6F 64 04 00 00 36 31 38 32 0F
+00 00 31 39 33 33 20 57 69 6C 6C 79 73 20 56 61
+6E 07 00 00 38 35 2D 30 35 34 30 34 00 00 49 6E
+61 75 67 75 72 61 6C 20 4D 41 54 43 4F 20 54 6F
+6F 6C 73 20 53 75 70 65 72 6E 61 74 69 6F 6E 61
+6C 73 20 4E 69 74 72 6F 20 46 75 6E 6E 79 20 43
+61 72 04 00 00 36 33 35 35 1E 00 00 31 39 35 37
+20 43 68 65 76 72 6F 6C 65 74 20 43 6F 72 76 65
+74 74 65 20 47 61 73 73 65 72 07 00 00 38 35 2D
+37 36 37 35 04 00 00 50 43 36 31 2A 00 00 47 72
+65 65 6E 20 48 6F 72 6E 65 74 20 46 6F 72 64 20
+22 54 22 20 53 68 6F 77 20 61 6E 64 20 47 6F 20
+52 6F 61 64 73 74 65 72 04 00 00 38 32 31 35 18
+00 00 31 39 34 30 20 46 6F 72 64 20 53 65 64 61
+6E 20 44 65 6C 69 76 65 72 79 07 00 00 38 35 2D
+37 36 32 38 16 00 00 33 37 20 46 6F 72 64 20 50
+61 6E 65 6C 20 44 65 6C 69 76 65 72 79 04 00 00
+31 32 39 34 10 00 00 47 79 70 73 79 20 44 75 6E
+65 20 42 75 67 67 79 06 00 00 48 2D 31 32 33 31
+23 00 00 43 68 72 79 73 6C 65 72 20 4E 65 77 20
+59 6F 72 6B 65 72 20 43 75 73 74 6F 6D 69 7A 69
+6E 67 20 4B 69 74 05 00 00 33 30 30 38 31 0E 00
+00 36 32 20 54 68 75 6E 64 65 72 62 69 72 64 04
+00 00 36 38 39 39 11 00 00 31 39 33 32 20 46 6F
+72 64 20 50 68 61 65 74 6F 6E 05 00 00 33 30 32
+37 30 0D 00 00 31 39 36 38 20 50 6C 79 6D 6F 75
+74 68 04 00 00 38 38 34 32 17 00 00 47 72 75 6D
+6D 61 6E 20 46 37 46 2D 33 4E 20 54 69 67 65 72
+63 61 74 04 00 00 48 32 34 34 14 00 00 4D 61 72
+74 69 6E 20 50 36 4D 20 53 65 61 6D 61 73 74 65
+72 04 00 00 35 35 30 30 0E 00 00 42 2D 32 35 48
+20 4D 69 74 63 68 65 6C 6C 04 00 00 33 34 30 32
+0D 00 00 50 2D 35 31 41 20 4D 75 73 74 61 6E 67
+04 00 00 36 34 32 31 3E 00 00 44 61 6D 62 75 73
+74 65 72 20 47 72 61 6E 64 20 53 6C 61 6D 20 42
+6F 6D 62 65 72 20 4C 61 6E 63 61 73 74 65 72 20
+42 49 20 53 70 65 63 69 61 6C 20 32 32 30 30 30
+6C 62 2E 20 42 6F 6D 62 05 00 00 31 34 34 34 33
+1E 00 00 4C 6F 63 6B 68 65 65 64 20 53 75 70 65
+72 2D 47 20 43 6F 6E 73 74 65 6C 6C 61 74 69 6F
+6E 04 00 00 35 36 31 30 13 00 00 57 69 6C 6C 69
+61 6D 73 20 42 72 6F 73 2E 20 49 6E 63 2E 07 00
+00 34 38 2D 33 31 39 31 10 00 00 43 6F 72 62 65
+6E 20 53 75 70 65 72 2D 41 63 65 05 00 00 30 35
+30 30 32 10 00 00 52 65 74 72 69 65 76 65 72 20
+52 6F 63 6B 65 74 03 00 00 43 61 72 04 00 00 38
+35 38 38 1D 00 00 50 6C 79 6D 6F 75 74 68 20 50
+72 6F 77 6C 65 72 20 77 69 74 68 20 54 72 61 69
+6C 65 72 04 00 00 35 30 30 31 14 00 00 43 6F 72
+76 65 74 74 65 20 47 72 61 6E 64 20 53 70 6F 72
+74 04 00 00 37 31 30 38 1D 00 00 43 6F 72 76 65
+74 74 65 20 49 6E 64 79 20 22 44 72 65 61 6D 20
+4D 61 63 68 69 6E 65 22 04 00 00 38 30 35 39 0C
+00 00 54 68 65 20 4D 75 6E 73 74 65 72 73 20 00
+00 42 6C 75 65 70 72 69 6E 74 65 72 3B 20 4D 75
+6E 73 74 65 72 73 20 4B 6F 61 63 68 20 6F 6E 6C
+79 07 00 00 38 35 2D 34 31 36 36 05 00 00 43 6F
+75 6E 74 3C 00 00 77 2F 43 75 74 74 69 6E 67 20
+45 64 67 65 20 43 45 43 34 38 30 38 36 20 48 65
+31 31 31 5A 20 22 5A 77 69 6C 6C 69 6E 67 22 20
+6B 69 74 2C 20 73 6B 69 6C 6C 20 6C 65 76 65 6C
+20 33 07 00 00 38 35 2D 37 36 36 36 23 00 00 43
+75 73 74 6F 6D 20 53 69 6C 76 65 72 61 64 6F 20
+61 6E 64 20 57 61 76 65 72 69 64 65 72 20 42 6F
+61 74 07 00 00 38 35 2D 36 38 35 38 16 00 00 53
+6E 61 6B 65 20 26 20 4D 6F 6E 67 6F 6F 73 65 20
+43 6F 6D 62 6F 07 00 00 38 35 2D 34 31 35 39 24
+00 00 4A 6F 65 20 41 6D 61 74 6F 20 53 75 70 65
+72 6D 61 6E 20 54 6F 70 20 46 75 65 6C 20 44 72
+61 67 73 74 65 72 04 00 00 37 35 34 31 0D 00 00
+53 6B 69 6C 6C 20 6C 65 76 65 6C 20 35 09 00 00
+48 38 32 35 2D 31 30 44 30 28 00 00 43 6F 63 61
+20 43 6F 6C 61 20 46 6F 72 64 20 4C 6F 75 69 73
+76 69 6C 6C 65 20 44 65 6C 69 76 65 72 79 20 54
+72 75 63 6B 07 00 00 38 35 2D 32 31 35 36 04 00
+00 32 39 35 34 0B 00 00 50 6F 72 73 63 68 65 20
+39 30 34 04 00 00 32 39 33 35 25 00 00 4C 61 6D
+62 6F 72 67 68 69 6E 69 20 43 6F 75 6E 74 61 63
+68 20 32 35 74 68 20 41 6E 6E 69 76 65 72 73 61
+72 79 07 00 00 38 35 2D 37 36 31 36 1F 00 00 41
+6D 65 72 69 63 61 6E 20 49 6E 74 65 72 6E 61 74
+69 6F 6E 61 6C 20 44 72 61 67 73 74 65 72 07 00
+00 38 35 2D 35 32 34 31 0D 00 00 50 2D 35 31 44
+20 4D 75 73 74 61 6E 67 07 00 00 38 35 2D 35 37
+31 30 11 00 00 52 42 2D 33 36 48 20 50 65 61 63
+65 6D 61 6B 65 72 05 00 00 30 35 31 30 34 14 00
+00 52 65 70 75 62 6C 69 63 20 52 43 2E 33 20 53
+65 61 62 65 65 05 00 00 50 41 31 35 32 05 00 00
+36 31 30 36 36 25 00 00 44 65 48 61 76 69 6C 6C
+61 6E 64 20 4D 6F 73 71 75 69 74 6F 20 42 20 4D
+6B 2E 49 56 2F 50 52 20 4D 6B 2E 49 56 07 00 00
+38 35 2D 37 35 34 36 10 00 00 50 2D 36 31 20 42
+6C 61 63 6B 20 57 69 64 6F 77 07 00 00 38 35 2D
+36 36 35 32 25 00 00 42 2D 31 37 46 20 46 6C 79
+69 6E 67 20 46 6F 72 74 72 65 73 73 20 22 4D 65
+6D 70 68 69 73 20 42 65 6C 6C 65 22 04 00 00 37
+35 30 30 0D 00 00 47 61 74 65 73 20 4C 65 61 72
+6A 65 74 03 00 00 35 31 39 15 00 00 47 72 75 6D
+6D 61 6E 20 46 38 46 2D 32 20 42 65 61 72 63 61
+74 04 00 00 37 35 32 33 12 00 00 46 2D 31 30 34
+43 20 53 74 61 72 66 69 67 68 74 65 72 05 00 00
+36 31 30 37 30 15 00 00 56 6F 75 67 68 74 20 46
+34 55 2D 31 41 20 43 6F 72 73 61 69 72 07 00 00
+38 35 2D 37 36 36 34 19 00 00 42 61 6C 64 77 69
+6E 2D 4D 6F 74 69 6F 6E 20 44 72 61 67 20 43 6F
+62 72 61 04 00 00 38 34 35 35 14 00 00 35 37 20
+43 68 65 76 72 6F 6C 65 74 20 42 65 6C 20 41 69
+72 16 00 00 50 72 6F 53 68 6F 70 2C 20 73 6B 69
+6C 6C 20 6C 65 76 65 6C 20 33 05 00 00 33 30 30
+35 32 0D 00 00 34 31 20 46 6F 72 64 20 57 6F 6F
+64 79 07 00 00 38 35 2D 32 35 35 37 19 00 00 36
+30 20 43 68 65 76 79 20 48 61 72 64 74 6F 70 20
+4C 6F 77 72 69 64 65 72 07 00 00 38 35 2D 37 36
+33 38 09 00 00 41 65 72 6F 76 65 74 74 65 07 00
+00 38 35 2D 30 30 39 34 1B 00 00 4C 69 27 6C 20
+43 6F 66 66 69 6E 20 43 75 73 74 6F 6D 20 53 68
+6F 77 20 52 6F 64 04 00 00 38 32 39 30 0A 00 00
+53 27 43 6F 6F 6C 20 42 75 73 07 00 00 38 35 2D
+32 35 39 37 12 00 00 53 74 72 65 65 74 20 46 69
+67 68 74 65 72 20 54 77 6F 04 00 00 37 36 30 39
+12 00 00 54 68 61 6D 65 73 20 50 61 6E 65 6C 20
+54 72 75 63 6B 07 00 00 38 35 2D 37 36 30 36 15
+00 00 44 61 6E 20 46 69 6E 6B 27 73 20 53 70 65
+65 64 77 61 67 6F 6E 05 00 00 30 35 35 30 35 1A
+00 00 4D 61 72 74 69 6E 20 4D 2D 31 33 30 20 43
+68 69 6E 61 20 43 6C 69 70 70 65 72 07 00 00 38
+35 2D 30 30 31 35 0E 00 00 46 6F 72 64 20 54 72
+69 2D 4D 6F 74 6F 72 04 00 00 50 41 33 30 1A 00
+00 57 72 69 67 68 74 20 42 72 6F 74 68 65 72 73
+20 4B 69 74 74 79 20 48 61 77 6B 07 00 00 38 35
+2D 35 30 38 31 13 00 00 46 69 72 73 74 20 4C 75
+6E 61 72 20 4C 61 6E 64 69 6E 67 07 00 00 38 35
+2D 35 38 33 39 18 00 00 4D 65 73 73 65 72 73 63
+68 6D 69 74 74 20 42 66 20 31 31 30 20 47 2D 32
+04 00 00 43 48 34 31 04 00 00 4A 30 30 34 05 00
+00 4A 54 31 32 33 04 00 00 4A 54 32 32 04 00 00
+4A 54 37 31 04 00 00 53 50 36 33 04 00 00 42 54
+31 36 0C 00 00 4F 56 2D 31 42 20 4D 6F 68 61 77
+6B 03 00 00 30 36 38 0B 00 00 56 2D 32 32 20 4F
+73 70 72 65 79 04 00 00 38 36 31 35 13 00 00 58
+2F 59 42 2D 33 35 20 46 6C 79 69 6E 67 20 57 69
+6E 67 05 00 00 31 31 32 30 38 1B 00 00 31 39 33
+33 20 43 61 64 69 6C 6C 61 63 20 56 2D 31 36 20
+54 6F 77 6E 20 43 61 72 04 00 00 36 36 31 38 27
+00 00 53 74 61 72 20 54 72 65 6B 20 33 20 50 69
+65 63 65 20 55 2E 53 2E 53 2E 20 45 6E 74 65 72
+70 72 69 73 65 20 53 65 74 12 00 00 4D 69 73 73
+69 6E 67 20 54 56 20 76 65 72 73 69 6F 6E 04 00
+00 38 39 31 35 0E 00 00 53 74 61 72 20 44 65 73
+74 72 6F 79 65 72 04 00 00 38 31 39 33 0A 00 00
+44 65 61 74 68 20 53 74 61 72 08 00 00 53 6E 61
+70 54 69 74 65 07 00 00 38 35 2D 33 36 32 31 07
+00 00 38 35 2D 33 36 32 32 17 00 00 42 61 62 79
+6C 6F 6E 20 35 20 53 70 61 63 65 20 53 74 61 74
+69 6F 6E 04 00 00 36 38 35 38 1F 00 00 53 74 61
+72 20 54 72 65 6B 20 33 20 50 69 65 63 65 20 41
+64 76 65 72 73 61 72 79 20 53 65 74 04 00 00 38
+37 36 32 06 00 00 31 2F 31 30 30 30 29 00 00 53
+74 61 72 20 54 72 65 6B 20 47 65 6E 65 72 61 74
+69 6F 6E 73 20 55 2E 53 2E 53 2E 20 45 6E 74 65
+72 70 72 69 73 65 20 42 04 00 00 38 38 38 33 03
+00 00 31 2F 34 05 00 00 4F 74 68 65 72 12 00 00
+56 69 73 69 62 6C 65 20 56 2D 38 20 45 6E 67 69
+6E 65 04 00 00 37 31 32 30 1C 00 00 31 39 36 39
+20 50 6F 6E 74 69 61 63 20 47 54 4F 20 22 54 68
+65 20 4A 75 64 67 65 22 09 00 00 31 2F 32 34 2D
+31 2F 32 35 05 00 00 31 2F 31 33 30 05 00 00 31
+2F 35 37 30 05 00 00 54 6F 20 64 6F 33 00 00 47
+75 73 20 47 72 69 73 73 6F 6D 20 4D 65 6D 6F 72
+69 61 6C 20 43 6F 6D 62 6F 20 77 2F 54 77 6F 20
+43 6F 6C 6C 65 63 74 6F 72 73 20 50 61 74 63 68
+65 73 09 00 00 46 69 72 65 20 49 72 6F 6E 0C 00
+00 77 2F 64 65 74 61 69 6C 20 73 65 74 2C 00 00
+77 2F 64 65 74 61 69 6C 20 73 65 74 20 61 6E 64
+20 69 6E 74 65 72 69 6F 72 20 73 65 74 2C 20 72
+65 73 69 6E 20 65 6E 67 69 6E 65 73 03 00 00 49
+43 4D 0E 00 00 53 70 69 74 66 69 72 65 20 4D 6B
+2E 49 58 1A 00 00 4D 65 73 73 65 72 73 63 68 6D
+69 74 74 20 4D 65 20 34 31 30 42 2D 32 2F 55 34
+0A 00 00 4D 6F 64 65 6C 63 72 61 66 74 12 00 00
+46 2D 38 32 42 20 54 77 69 6E 20 4D 75 73 74 61
+6E 67 1F 00 00 31 39 35 33 20 53 74 75 64 65 62
+61 6B 65 72 20 53 74 61 72 6C 69 6E 65 72 20 43
+6F 75 70 65 04 00 00 32 34 33 36 0E 00 00 42 75
+67 61 74 74 69 20 45 42 20 31 31 30 2D 00 00 53
+74 61 72 20 54 72 65 6B 20 4B 6C 69 6E 67 6F 6E
+20 42 69 72 64 20 6F 66 20 50 72 65 79 20 46 6C
+69 67 68 74 20 44 69 73 70 6C 61 79 16 00 00 50
+6F 72 73 63 68 65 20 39 31 31 20 53 6C 61 6E 74
+20 4E 6F 73 65 05 00 00 36 31 30 37 33 25 00 00
+44 6F 75 67 6C 61 73 20 41 2D 31 4A 20 53 6B 79
+72 61 69 64 65 72 20 55 2E 53 2E 20 41 69 72 20
+46 6F 72 63 65 04 00 00 36 33 33 39 04 00 00 36
+39 35 35 04 00 00 37 35 33 30 06 00 00 34 38 2D
+30 32 30 05 00 00 31 2F 34 35 30 0F 00 00 55 2E
+53 2E 53 2E 20 4D 69 73 73 6F 75 72 69 05 00 00
+36 31 30 35 37 15 00 00 48 65 69 6E 6B 65 6C 20
+48 65 32 31 39 20 41 2D 37 20 55 48 55 05 00 00
+36 31 30 34 31 05 00 00 31 31 36 32 34 32 00 00
+43 6F 6E 73 6F 6C 69 64 61 74 65 64 20 42 2D 32
+34 4A 20 4C 69 62 65 72 61 74 6F 72 20 54 68 65
+20 44 72 61 67 6F 6E 20 26 20 48 69 73 20 54 61
+69
diff --git a/src/testcases/org/apache/poi/hssf/data/duprich1.xls b/src/testcases/org/apache/poi/hssf/data/duprich1.xls
new file mode 100644
index 0000000000000000000000000000000000000000..3fddbedd27b9f4e5fdcb36af6acf4367b03aa081
GIT binary patch
literal 21504
zcmeI4TWlRi8OLYO*=uvLleB4?r0$8Gi<8)??Ko-Dkj8H81h=tc*$!z{BiBhzut{P^
zjvdhlM7Tuafg(^JkWi&k1VRM~T6&3uDwH4|;GqH`szRSq9xGK`1cIP8=Kr7B-I?zs
zDJc-Cz^=7t&wswznK`q+`DW)k>+{QBEV=yb3oGAJHQNKKtgg-{Ds<94yl>8Qy@Gvy
zo-#Xbz<VSW+ka6HBrz^z7^thOUyJ&>@D>;OEmcy_`<L*l)bFs5s?%zzQiC(q<JFm&
z>aoh+xihoVr>ZlRTem%^+c5624Hwa--5yEwkoq+C#p*8Ix~2McnST9&&ikr<-HrB6
zc#FN!`+wZD184EfM@n5f-;?^aQNJ$6tEVpLbKcY`?P{g^8S>A6<|{l6)dya;no*N#
zT%A<6(z-&uWb0L5RKE9owe8c3kN^7X4gLxhsAWnuu5D~;X=-ZQHQJiJZSe2L7+vAm
z9viA2`?#B-K}G1U{Nycd?)gv+ev^t-gUnG=iq5u8ZBlJYjj{4g72T4tR?`+MQ)^>u
zBWz=>U1O~cev8_u;2g$UZMIS8J<~=0-Ks_HkQJc;HFcR3Tiu>Lw!%)eS>5YYn4O*0
zpPj0!b<eA)JJl+5#G&D|r^hz#8f~_6bYp|R4!vEe$zyt}CgXba`WiPQtCi&;g+*=#
zbnCCpc}=Nl_SNcnv@^e;rp&a#EN+c@L9G_{tRyE>qxzw`+h)q!mS#z-+Mr%kjkURI
zN=vie2Yx%y=gkfs8+WC0v{~aankVpjQ*@1?!CTbJAOxpoe9*F~;+|v($<NrMUQzeU
z%FHK__35T%Z9tW{)_D=z)dh@aTWNNFUT=1CMoD_+Wpz8osZxKL2L<_dvBGq^44wYx
z%<%r{^lsP7f1`AkdcFMr%jq6RTfSxedBOC<-!em%{_+jdlN+SJa)b1ju1SBY<STVf
z&GT4)uB?ws&V~B8^jx5i%g*`wc>B3%{&794oL6;f_d>QZQhTSTW@n~Pp2y_$&|)Ut
zrbZ@DRV%}%t5dV*p`KjF)RH<l@+IY~v*okpOJ1xlfvR&mJoT>X^snIk0P>*3q3Y@B
znb}G|3Y|d92F6cS6HL<6XJ#vhrY2{RG&DYS0wneIM4Y^*KUo<#7~|c<_?ar+W{G`0
zd7{oaGJfVnrLPBN>32QVGe>VzYIyF*tTCYKOwfjt`@0`)?PzQ3z-KzpeW;~!xVx|N
zaPOgk{Q>S5yEkrYFDtdTdk_`2wY9Z(bZ%XMcOCb(ZL2hoOw4Vh+N#yQnMtiWwHh9u
z)oPnjb5mMv*9xCntNXMXnX78GL#xBpV_NMrHd8};n^tKJ?d@8nHME<y44WF-O<U3$
z+D%*18rn@;(i+-LThh<aZrYO7VA_(^VA_(_&|%t=*3e<vlGe~++LG4LVcL?`&|%t=
z*3gmmi|M5f)0V6T)0V6T)0V6T)0VV`t)?w$4O>lHSOc!vj<#*Mx_u+VJ>5P10|2VC
zeOnt22YU{U;C7*BZuW`F^zq8T^i=CCI6gB`t<F}4PGbjn$j7S<UU|yM(7=A&Xzs60
zRcFReRz_yVC#NQ-J^{;t-tLcqlLOW9vsFmebPs4onMAgF6s1*9j?dz*v-{Yo$*C=s
z!_zY?eBkiV!%Iv?rl7D&FNW6>F!lHLj$jsN8K-N?=tmQgHMQ2(kXlj1;BfB{a2}jH
za&q!$Ww<(XcJe5jH*#>_K5)!oJAM2(`e<iICq~D}@bKQT-bcoIdXcAd`}UnIV(4H$
zJ_${g-cL<T9+{k-oSv$zuk=(;O;4Sfof)UbJdIYIn$|XS=Kkrk8!&(|LLvG_7APOx
zrrOMP;WhIx_5*bv9fjWhS&mg|UJc>??gE-kKjh<*K8j-%#~<PNa~vCRm3Csle;LQ;
zaJ-7+UHDj2@E#{{yolp(aBRf~9>j3{Hja?WEFS8`;$cC_Oph?@#p4xJ>Y*za!LPCH
zC3Orgk?)t_RjGQk?cL}8_^bXSgL}qw`X-&eS-*Zxr<_BcY+FY+jL-C0ST6aj>kjOn
z*SWu-U!TPti-%e~{Z~>gUJE`Cx66C%@euN&)DoJ8%`9`-p18ygrx(_1TQt5-r?H6I
zH0G~OL)ToB2EIkwd%E`&`hlBK9@L^#v93C_-q`p#>agT7igmL8GDRE9VJWP;PQMyO
z8$S&d+favDB~!Fv{HQlj@*i*<#4V%wd!V!wcURoH^s9NfJ1rS1?M?N2belo(W?*2R
z5G}ob-G?0pwp6JN*fSV5TnC2QG+vV0G+vO}G+u(*G+vzAG$L7>hB16i8iz)0K8#_J
zW)LF)tjQ<>z&ea7L9ukB%1|uVC?AR?8WljXhl~oL;1N<4LD9(=TMX5os{{&Bgw%E$
z6jrpUS^&kNY|dK<#X)V<BB<rLS`3A?PiiCjSo@}`9tsQHR4sv8nX9Ex@cOB385BHk
zs&0qEQYck-Kw)-E)p96!@l@RjRms%~s5QB|3#u_!E1{ZlwF+u&u2w@~5Ts>tU}5o>
zss<>MXFmHqP|dljKyA#`8mLXVYJ}RHt0t(HT&;y_&DA=nExB3`g_W|dkK?+IEBsWE
z5Ul7@MMAJ%N)-vQiiB*<Z6u^KS0rRxu1JWrk&pwqjf8B^6$!D5gjhvFtRf*+kr1m$
zh*c!SDiUH939*WVSVcmtA|Y0h5UWUtRV2hJ5@Hnzv5JIPMMA71Ay$zPt4N4dB*ZEb
zVigIoiiB82LaZVoR*{fQ(Z^XrIEh<AN|=-^6D3STt|B44X(87oc%eE5cv9sOQi2z9
zZ6w6j?h;Z$Nv_Q$qy#VI+FU{yJ#=j@Atg+guFWN+1n=eATtZ6lUark0qy+Ef+FU|P
z@LsOXC8PxJ<=R|AO7LE;%_XD+@8#NDLQ3#nuFWN+1n=eATtZ6lUark0qy+C}ZRQpv
z^C4wHNLdh47KD^>Yf`6nrc9JIAqenjLduw@tPd$`Lafatq>OpWZHr4t8S|8Da|tQq
z*2}fIgpgy`<`PoIEtG3>2`OWKb8RjmWz27`%_XFa`OUStgp@JAxi*)OGUhke<`PoI
z{N~zRLduxmT$@Ws8S|TKa|tP9esgUuA!W>OuFWNc_dnK$_<|5$5aJ6$d`-x%lnGxG
z@{wG*g!q~eYjX+l1tGrhA-*8Q7e2%ng!saTkX-v|5giiBCBzp##21A4!iV^R5MTHZ
zUl8I8AL0u_eBncUL5MGWh%X57g%9xsA-?b-z97UGKExM<_`-+yf)HQ$5Z<F&LIOcZ
zAP5NrA%P}jcgjSd33(t_E+K&?#M)d!0zpV12nhrsfgmIhgam>R&UcoOKoAlL9});c
z_^pq7p6f#bK}aA72?Qa5AS4ik1cH!25E2MN0zpV12nhrsfgmIhgam?+KoAlLLIOcZ
zAPC{Q#S#(<LP9}EC<qBPA&dg>K7^~+I=#p>$|WS!gmmXQT|z=ZNGJ#i1tFmzBou^%
zf)LhiuXHE~2?ZgcAS4uogu;h}f{;)U5(+~24We7SJIjQEkWdg33PM6bNGJ#i1tFmz
zBou^%f{;)U5(+{>K}aYF;ab)b5(z>gK}aMBi8LV(rq?~vgzU|gOGu;%u{M{GNDvYU
zLLxy(BnXKFA(0@2_r>-aMS_q>5E2POB0)$b2#EwCksu@zghYZ6exdBP#k~)S1R;?i
zBoc%~f{;iM5(z>gK}aMBi3A~$AS4omM1l~;H!LBsAS4!q#Db7m6Vj715o<zvbLA2e
zYeKBeB_tMv#Db7m5E2VQVnIkO2x0m5s>FhjSP&8mLSjKkEC`7OA+aDN7KFrtkXR5B
z3m*~-LSjKkEC}Ia3GOFy?^I(!NGu461tGB@Bo>6kf{<7c!kAZ`+LvD2L=*DSTyeF#
zKUZ8OSj9WSzTC!H=Am4<ge01fhjW`tNFoSH1R;qaBoTxpf{;WI!qt)O&qNTC2tpD;
zNFoSH1R;qaBoTxpf{;WIk_bW)K}aG9NdzH@AS4llB*KRzf{;WIk_bW)K}aG9NdzHD
zPRJYhG^>{@JoV66s{PX;bl#-sy9*w<aSc}1-#P##hD+l3gN4w!xb8!&@G->pKHT4@
zu%!x}YD4Hv*9oE5rZK$arkNlp2O*aPMls~Xo;8YtkW;-;9E37#ZNtwTgf{%lL1@Fz
zoLX)8nS;=VpE+c3mD3s+P_W@=1{7@gnE?eGer7<yhMyTwu;FJ8LK}YOa?ysLxm>j2
zX9g5(_?e4=O5PSO2G-<?0foj~F`&TSH~qqZf(<|OR&QNy<3tXm(wv;gH{^-|1si^5
zK*5He39}79(@op(Gu^ZeKUbh^_?ZC(8-8X$;Xf08&Vq!Vo{+8Lm9~mk+A7!Gdcxg$
z!rgkp-SS&Zw-h&Y<Oz36R^6O#V1VC$x;8g-<Oz4{33uxWck2mv>j`)333uxWck2mv
z>j`)333uxWck2mv>j`)333uxWck2mv%W-ZeRue|fCRP(h&ZbfmMz)F*Yj*ui7}+ZK
zN}DjUwYgWiB(8K3Mz+1=1_}TDF!CE1Lw|?kZdPx5Z+q|at+IzZYJRKCKi`*AA`HcL
z3wz)yo^oK+wRZE6aQXZ*f4XvTqW*hdjn(E2FaDNM{SoZuYMK89;B?FMMcBKrb5i9u
zdMxo3+y!td<8(bdfyZvt<Wv{ltLmGB9e=&#nVSSA6kE{)MGq7`Q1n3214R!MJy7&O
z(E~*f6g^P%K+yw558TQgc)#_3>GjuMe|pQR`lr5z^?%Ei?{l61Q|w&xGd{qO9fRS6
z*!c|jBiQS)KaQPofC=o&v7g4y_`s*IFU0;$>{)z(F@Sd#^ZP8b-RRhWf|-|fr~gN%
z&$0hNr_BdP)I#KB>5M$^tATILeW&ZY?`Ufga6o?)ThRkW4-`F6^gz)AMGq7`Q1n32
z14R!MJy7((|6>nu9naM=m&W{FpAXvc`+BaNxz^@0u>5atuFJW0=Q^H0MZljN;98$Q
zA;8D#xZdX@bbN4*YkvMFARmq6195x|jt{@_kvBf*#+5nk6&%-KZ^Yh&eJyrAn8wG^
zXnzkokHvQDdSFOR<8M|~RIi%CaYj9X-oN>6Ies56YaKbN#C%oiqJGs6Pn&mm9elOv
znZ4mpJYLf*@i1ziQ76<9-HsDk@=YJ{3xIk3Y{$)>_>C5mGf=~7PMyNvxc=;Y=!N6D
zO-z}^@BU3A<;Ghx>gO2Z__^8o88g#^2ZuoQpoXKm4OM*wK3IEp{0pC-50qy0{{vNA
B5^(?k

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/data/duprich2.xls b/src/testcases/org/apache/poi/hssf/data/duprich2.xls
new file mode 100644
index 0000000000000000000000000000000000000000..57af63b3d4db728347a498037ee0f02a0211a2e4
GIT binary patch
literal 13824
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

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/data/evencontinuation.txt b/src/testcases/org/apache/poi/hssf/data/evencontinuation.txt
new file mode 100644
index 000000000..4740b2747
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/data/evencontinuation.txt
@@ -0,0 +1,16 @@
+14 00                                               # String length 0x14=20
+01                                                  # Option flag, 16bit
+# String: At a dinner party or
+41 00 74 00 20 00 61 00 20 00
+64 00 69 00 6E 00 6E 00 65 00
+72 00 20 00 70 00 61 00 72 00
+74 00 79 00 20 00 6F 00 72 00
+
+# Continuation record (new string on the boundry)
+11 00                                               # String length 0x11=17
+00                                                  # Option flag, 8bit
+# String: At a dinner party
+41 74 20 61 20
+64 69 6E 6E 65
+72 20 70 61 72
+74 79
diff --git a/src/testcases/org/apache/poi/hssf/data/richtextdata.txt b/src/testcases/org/apache/poi/hssf/data/richtextdata.txt
new file mode 100644
index 000000000..a34559583
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/data/richtextdata.txt
@@ -0,0 +1,21 @@
+1D 00                                               # String length 0x1b=29
+09                                                  # Option flag, rich text + 16bit
+02 00                                               # Formatting runs
+# String: At a dinner party or
+41 00 74 00 20 00 61 00 20 00
+64 00 69 00 6E 00 6E 00 65 00
+72 00 20 00 70 00 61 00 72 00
+74 00 79 00 20 00 6F 00 72 00
+
+# Continuation record
+00                                                  # option flag
+
+# string:at at at
+41 74 20
+41 74 20
+41 74 20
+
+00 00                                               # Formatting run 1, first formated char at 0
+00 00                                               # Formatting run 1, Index to font record
+02 00                                               # Formatting run 2, first formated char at 2
+00 00                                               # Formatting run 2, Index to font record
diff --git a/src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt b/src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt
new file mode 100644
index 000000000..c9bc332e5
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt
@@ -0,0 +1,7 @@
+14 00                                               # String length 0x14=20
+01                                                  # Option flag, 16bit
+# String: At a dinner party or
+41 00 74 00 20 00 61 00 20 00
+64 00 69 00 6E 00 6E 00 65 00
+72 00 20 00 70 00 61 00 72 00
+74 00 79 00 20 00 6F 00 72 00
diff --git a/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR1.txt b/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR1.txt
new file mode 100644
index 000000000..821142ade
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR1.txt
@@ -0,0 +1,9 @@
+
+# Continuation record
+22 00                                               # String length 0x11=17
+00                                                  # Option flag, 8bit
+# String: At a dinner party
+41 74 20 61 20
+64 69 6E 6E 65
+72 20 70 61 72
+74 79
diff --git a/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR2.txt b/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR2.txt
new file mode 100644
index 000000000..f4eb4c3c3
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/data/stringacross2continuationsCR2.txt
@@ -0,0 +1,7 @@
+# Continuation record
+00                                                  # option flag
+# String: At a dinner party
+41 74 20 61 20
+64 69 6E 6E 65
+72 20 70 61 72
+74 79
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
index 56e6fec76..b574a3426 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -55,24 +54,29 @@
 
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.*;
-
-import junit.framework.*;
+import junit.framework.TestCase;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.util.BinaryTree;
+import org.apache.poi.util.HexRead;
+import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.LittleEndianConsts;
 
 import java.io.*;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Iterator;
 
 /**
  * @author Marc Johnson (mjohnson at apache dot org)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class TestSSTRecord
-    extends TestCase
+        extends TestCase
 {
-    private String              _test_file_path;
+    private String _test_file_path;
     private static final String _test_file_path_property =
-        "HSSF.testdata.path";
+            "HSSF.testdata.path";
 
     /**
      * Creates new TestSSTRecord
@@ -80,10 +84,10 @@ public class TestSSTRecord
      * @param name
      */
 
-    public TestSSTRecord(String name)
+    public TestSSTRecord( String name )
     {
-        super(name);
-        _test_file_path = System.getProperty(_test_file_path_property);
+        super( name );
+        _test_file_path = System.getProperty( _test_file_path_property );
     }
 
     /**
@@ -93,118 +97,119 @@ public class TestSSTRecord
      */
 
     public void testProcessContinueRecord()
-        throws IOException
+            throws IOException
     {
-        byte[] testdata = readTestData("BigSSTRecord");
-        byte[] input    = new byte[ testdata.length - 4 ];
+        byte[] testdata = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord" );
+        byte[] input = new byte[testdata.length - 4];
 
-        System.arraycopy(testdata, 4, input, 0, input.length);
-        SSTRecord record         =
-            new SSTRecord(LittleEndian.getShort(testdata, 0),
-                          LittleEndian.getShort(testdata, 2), input);
-        byte[]    continueRecord = readTestData("BigSSTRecordCR");
+        System.arraycopy( testdata, 4, input, 0, input.length );
+        SSTRecord record =
+                new SSTRecord( LittleEndian.getShort( testdata, 0 ),
+                        LittleEndian.getShort( testdata, 2 ), input );
+        byte[] continueRecord = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecordCR" );
 
-        input = new byte[ continueRecord.length - 4 ];
-        System.arraycopy(continueRecord, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        assertEquals(1464, record.getNumStrings());
-        assertEquals(688, record.getNumUniqueStrings());
-        assertEquals(688, record.countStrings());
+        input = new byte[continueRecord.length - 4];
+        System.arraycopy( continueRecord, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        assertEquals( 1464, record.getNumStrings() );
+        assertEquals( 688, record.getNumUniqueStrings() );
+        assertEquals( 688, record.countStrings() );
         byte[] ser_output = record.serialize();
-        int    offset     = 0;
-        short  type       = LittleEndian.getShort(ser_output, offset);
+        int offset = 0;
+        short type = LittleEndian.getShort( ser_output, offset );
 
         offset += LittleEndianConsts.SHORT_SIZE;
-        short length = LittleEndian.getShort(ser_output, offset);
+        short length = LittleEndian.getShort( ser_output, offset );
 
         offset += LittleEndianConsts.SHORT_SIZE;
-        byte[] recordData = new byte[ length ];
+        byte[] recordData = new byte[length];
 
-        System.arraycopy(ser_output, offset, recordData, 0, length);
+        System.arraycopy( ser_output, offset, recordData, 0, length );
         offset += length;
-        SSTRecord testRecord = new SSTRecord(type, length, recordData);
+        SSTRecord testRecord = new SSTRecord( type, length, recordData );
 
-        assertEquals(ContinueRecord.sid,
-                     LittleEndian.getShort(ser_output, offset));
+        assertEquals( ContinueRecord.sid,
+                LittleEndian.getShort( ser_output, offset ) );
         offset += LittleEndianConsts.SHORT_SIZE;
-        length = LittleEndian.getShort(ser_output, offset);
+        length = LittleEndian.getShort( ser_output, offset );
         offset += LittleEndianConsts.SHORT_SIZE;
-        byte[] cr = new byte[ length ];
+        byte[] cr = new byte[length];
 
-        System.arraycopy(ser_output, offset, cr, 0, length);
+        System.arraycopy( ser_output, offset, cr, 0, length );
         offset += length;
-        assertEquals(offset, ser_output.length);
-        testRecord.processContinueRecord(cr);
-        assertEquals(record, testRecord);
+        assertEquals( offset, ser_output.length );
+        testRecord.processContinueRecord( cr );
+        assertEquals( record, testRecord );
 
         // testing based on new bug report
-        testdata = readTestData("BigSSTRecord2");
-        input    = new byte[ testdata.length - 4 ];
-        System.arraycopy(testdata, 4, input, 0, input.length);
-        record = new SSTRecord(LittleEndian.getShort(testdata, 0),
-                               LittleEndian.getShort(testdata, 2), input);
-        byte[] continueRecord1 = readTestData("BigSSTRecord2CR1");
+        testdata = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2" );
+        input = new byte[testdata.length - 4];
+        System.arraycopy( testdata, 4, input, 0, input.length );
+        record = new SSTRecord( LittleEndian.getShort( testdata, 0 ),
+                LittleEndian.getShort( testdata, 2 ), input );
+        byte[] continueRecord1 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR1" );
 
-        input = new byte[ continueRecord1.length - 4 ];
-        System.arraycopy(continueRecord1, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord2 = readTestData("BigSSTRecord2CR2");
+        input = new byte[continueRecord1.length - 4];
+        System.arraycopy( continueRecord1, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord2 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR2" );
 
-        input = new byte[ continueRecord2.length - 4 ];
-        System.arraycopy(continueRecord2, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord3 = readTestData("BigSSTRecord2CR3");
+        input = new byte[continueRecord2.length - 4];
+        System.arraycopy( continueRecord2, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord3 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR3" );
 
-        input = new byte[ continueRecord3.length - 4 ];
-        System.arraycopy(continueRecord3, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord4 = readTestData("BigSSTRecord2CR4");
+        input = new byte[continueRecord3.length - 4];
+        System.arraycopy( continueRecord3, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord4 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR4" );
 
-        input = new byte[ continueRecord4.length - 4 ];
-        System.arraycopy(continueRecord4, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord5 = readTestData("BigSSTRecord2CR5");
+        input = new byte[continueRecord4.length - 4];
+        System.arraycopy( continueRecord4, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord5 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR5" );
 
-        input = new byte[ continueRecord5.length - 4 ];
-        System.arraycopy(continueRecord5, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord6 = readTestData("BigSSTRecord2CR6");
+        input = new byte[continueRecord5.length - 4];
+        System.arraycopy( continueRecord5, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord6 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR6" );
 
-        input = new byte[ continueRecord6.length - 4 ];
-        System.arraycopy(continueRecord6, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        byte[] continueRecord7 = readTestData("BigSSTRecord2CR7");
+        input = new byte[continueRecord6.length - 4];
+        System.arraycopy( continueRecord6, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        byte[] continueRecord7 = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord2CR7" );
 
-        input = new byte[ continueRecord7.length - 4 ];
-        System.arraycopy(continueRecord7, 4, input, 0, input.length);
-        record.processContinueRecord(input);
-        assertEquals(158642, record.getNumStrings());
-        assertEquals(5249, record.getNumUniqueStrings());
-        assertEquals(5249, record.countStrings());
+        input = new byte[continueRecord7.length - 4];
+        System.arraycopy( continueRecord7, 4, input, 0, input.length );
+        record.processContinueRecord( input );
+        assertEquals( 158642, record.getNumStrings() );
+        assertEquals( 5249, record.getNumUniqueStrings() );
+        assertEquals( 5249, record.countStrings() );
         ser_output = record.serialize();
-        offset     = 0;
-        type       = LittleEndian.getShort(ser_output, offset);
-        offset     += LittleEndianConsts.SHORT_SIZE;
-        length     = LittleEndian.getShort(ser_output, offset);
-        offset     += LittleEndianConsts.SHORT_SIZE;
-        recordData = new byte[ length ];
-        System.arraycopy(ser_output, offset, recordData, 0, length);
-        offset     += length;
-        testRecord = new SSTRecord(type, length, recordData);
-        for (int count = 0; count < 7; count++)
+        offset = 0;
+        type = LittleEndian.getShort( ser_output, offset );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        length = LittleEndian.getShort( ser_output, offset );
+        offset += LittleEndianConsts.SHORT_SIZE;
+        recordData = new byte[length];
+        System.arraycopy( ser_output, offset, recordData, 0, length );
+        offset += length;
+        testRecord = new SSTRecord( type, length, recordData );
+        for ( int count = 0; count < 7; count++ )
         {
-            assertEquals(ContinueRecord.sid,
-                         LittleEndian.getShort(ser_output, offset));
+            assertEquals( ContinueRecord.sid,
+                    LittleEndian.getShort( ser_output, offset ) );
             offset += LittleEndianConsts.SHORT_SIZE;
-            length = LittleEndian.getShort(ser_output, offset);
+            length = LittleEndian.getShort( ser_output, offset );
             offset += LittleEndianConsts.SHORT_SIZE;
-            cr     = new byte[ length ];
-            System.arraycopy(ser_output, offset, cr, 0, length);
-            testRecord.processContinueRecord(cr);
+            cr = new byte[length];
+            System.arraycopy( ser_output, offset, cr, 0, length );
+            testRecord.processContinueRecord( cr );
             offset += length;
         }
-        assertEquals(offset, ser_output.length);
-        assertEquals(record, testRecord);
+        assertEquals( offset, ser_output.length );
+        assertEquals( record, testRecord );
+        assertEquals( record.countStrings(), testRecord.countStrings() );
     }
 
     /**
@@ -214,23 +219,23 @@ public class TestSSTRecord
      */
 
     public void testHugeStrings()
-        throws IOException
+            throws IOException
     {
-        SSTRecord record       = new SSTRecord();
-        byte[][]  bstrings     =
-        {
-            new byte[ 9000 ], new byte[ 7433 ], new byte[ 9002 ],
-            new byte[ 16998 ]
-        };
-        String[]  strings      = new String[ bstrings.length ];
-        int       total_length = 0;
+        SSTRecord record = new SSTRecord();
+        byte[][] bstrings =
+                {
+                    new byte[9000], new byte[7433], new byte[9002],
+                    new byte[16998]
+                };
+        String[] strings = new String[bstrings.length];
+        int total_length = 0;
 
-        for (int k = 0; k < bstrings.length; k++)
+        for ( int k = 0; k < bstrings.length; k++ )
         {
-            Arrays.fill(bstrings[ k ], ( byte ) ('a' + k));
-            strings[ k ] = new String(bstrings[ k ]);
-            record.addString(strings[ k ]);
-            total_length += 3 + bstrings[ k ].length;
+            Arrays.fill( bstrings[k], (byte) ( 'a' + k ) );
+            strings[k] = new String( bstrings[k] );
+            record.addString( strings[k] );
+            total_length += 3 + bstrings[k].length;
         }
 
         // add overhead of SST record
@@ -240,88 +245,88 @@ public class TestSSTRecord
         total_length += 4;
 
         // add overhead of six records
-        total_length += (6 * 4);
-        byte[] content = new byte[ record.getRecordSize() ];
+        total_length += ( 6 * 4 );
+        byte[] content = new byte[record.getRecordSize()];
 
-        record.serialize(0, content);
-        assertEquals(total_length, content.length);
-        for (int index = 0; index != content.length; )
+        record.serialize( 0, content );
+        assertEquals( total_length, content.length );
+        for ( int index = 0; index != content.length; )
         {
-            short record_type = LittleEndian.getShort(content, index);
+            short record_type = LittleEndian.getShort( content, index );
 
             index += LittleEndianConsts.SHORT_SIZE;
-            short record_length = LittleEndian.getShort(content, index);
+            short record_length = LittleEndian.getShort( content, index );
 
             index += LittleEndianConsts.SHORT_SIZE;
-            byte[] data = new byte[ record_length ];
+            byte[] data = new byte[record_length];
 
-            System.arraycopy(content, index, data, 0, record_length);
+            System.arraycopy( content, index, data, 0, record_length );
             index += record_length;
-            if (record_type == SSTRecord.sid)
+            if ( record_type == SSTRecord.sid )
             {
-                record = new SSTRecord(record_type, record_length, data);
+                record = new SSTRecord( record_type, record_length, data );
             }
             else
             {
-                record.processContinueRecord(data);
+                record.processContinueRecord( data );
             }
         }
-        assertEquals(strings.length, record.getNumStrings());
-        assertEquals(strings.length, record.getNumUniqueStrings());
-        assertEquals(strings.length, record.countStrings());
-        for (int k = 0; k < strings.length; k++)
+        assertEquals( strings.length, record.getNumStrings() );
+        assertEquals( strings.length, record.getNumUniqueStrings() );
+        assertEquals( strings.length, record.countStrings() );
+        for ( int k = 0; k < strings.length; k++ )
         {
-            assertEquals(strings[ k ], record.getString(k));
+            assertEquals( strings[k], record.getString( k ) );
         }
-        record        = new SSTRecord();
-        bstrings[ 1 ] = new byte[ bstrings[ 1 ].length - 1 ];
-        for (int k = 0; k < bstrings.length; k++)
+        record = new SSTRecord();
+        bstrings[1] = new byte[bstrings[1].length - 1];
+        for ( int k = 0; k < bstrings.length; k++ )
         {
-            if ((bstrings[ k ].length % 2) == 1)
+            if ( ( bstrings[k].length % 2 ) == 1 )
             {
-                Arrays.fill(bstrings[ k ], ( byte ) ('a' + k));
-                strings[ k ] = new String(bstrings[ k ]);
+                Arrays.fill( bstrings[k], (byte) ( 'a' + k ) );
+                strings[k] = new String( bstrings[k] );
             }
             else
             {
-                char[] data = new char[ bstrings[ k ].length / 2 ];
+                char[] data = new char[bstrings[k].length / 2];
 
-                Arrays.fill(data, ( char ) ('\u2122' + k));
-                strings[ k ] = new String(data);
+                Arrays.fill( data, (char) ( '\u2122' + k ) );
+                strings[k] = new String( data );
             }
-            record.addString(strings[ k ]);
+            record.addString( strings[k] );
         }
-        content = new byte[ record.getRecordSize() ];
-        record.serialize(0, content);
+        content = new byte[record.getRecordSize()];
+        record.serialize( 0, content );
         total_length--;
-        assertEquals(total_length, content.length);
-        for (int index = 0; index != content.length; )
+        assertEquals( total_length, content.length );
+        for ( int index = 0; index != content.length; )
         {
-            short record_type = LittleEndian.getShort(content, index);
+            short record_type = LittleEndian.getShort( content, index );
 
             index += LittleEndianConsts.SHORT_SIZE;
-            short record_length = LittleEndian.getShort(content, index);
+            short record_length = LittleEndian.getShort( content, index );
 
             index += LittleEndianConsts.SHORT_SIZE;
-            byte[] data = new byte[ record_length ];
+            byte[] data = new byte[record_length];
 
-            System.arraycopy(content, index, data, 0, record_length);
+            System.arraycopy( content, index, data, 0, record_length );
             index += record_length;
-            if (record_type == SSTRecord.sid)
+            if ( record_type == SSTRecord.sid )
             {
-                record = new SSTRecord(record_type, record_length, data);
+                record = new SSTRecord( record_type, record_length, data );
             }
             else
             {
-                record.processContinueRecord(data);
+                record.processContinueRecord( data );
             }
         }
-        assertEquals(strings.length, record.getNumStrings());
-        assertEquals(strings.length, record.getNumUniqueStrings());
-        assertEquals(strings.length, record.countStrings());
-        for (int k = 0; k < strings.length; k++)
+        assertEquals( strings.length, record.getNumStrings() );
+        assertEquals( strings.length, record.getNumUniqueStrings() );
+        assertEquals( strings.length, record.countStrings() );
+        for ( int k = 0; k < strings.length; k++ )
         {
-            assertEquals(strings[ k ], record.getString(k));
+            assertEquals( strings[k], record.getString( k ) );
         }
     }
 
@@ -330,9 +335,8 @@ public class TestSSTRecord
      *
      * @exception IOException
      */
-
     public void testSSTRecordBug()
-        throws IOException
+            throws IOException
     {
 
         // create an SSTRecord and write a certain pattern of strings
@@ -342,68 +346,67 @@ public class TestSSTRecord
         // the record will start with two integers, then this string
         // ... that will eat up 16 of the 8224 bytes that the record
         // can hold
-        record.addString("Hello");
+        record.addString( "Hello" );
 
         // now we have an additional 8208 bytes, which is an exact
         // multiple of 16 bytes
         long testvalue = 1000000000000L;
 
-        for (int k = 0; k < 2000; k++)
+        for ( int k = 0; k < 2000; k++ )
         {
-            record.addString(String.valueOf(testvalue++));
+            record.addString( String.valueOf( testvalue++ ) );
         }
-        byte[] content = new byte[ record.getRecordSize() ];
+        byte[] content = new byte[record.getRecordSize()];
 
-        record.serialize(0, content);
-        assertEquals(( byte ) 13, content[ 4 + 8228 ]);
-        assertEquals(( byte ) 13, content[ 4 + 8228 * 2 ]);
-        assertEquals(( byte ) 13, content[ 4 + 8228 * 3 ]);
+        record.serialize( 0, content );
+        assertEquals( (byte) 13, content[4 + 8228] );
+        assertEquals( (byte) 13, content[4 + 8228 * 2] );
+        assertEquals( (byte) 13, content[4 + 8228 * 3] );
     }
 
     /**
      * test simple addString
      */
-
     public void testSimpleAddString()
     {
         SSTRecord record = new SSTRecord();
-        String    s1     = "Hello world";
+        String s1 = "Hello world";
 
         // \u2122 is the encoding of the trademark symbol ...
-        String    s2     = "Hello world\u2122";
+        String s2 = "Hello world\u2122";
 
-        assertEquals(0, record.addString(s1));
-        assertEquals(s1, record.getString(0));
-        assertEquals(1, record.countStrings());
-        assertEquals(1, record.getNumStrings());
-        assertEquals(1, record.getNumUniqueStrings());
-        assertEquals(0, record.addString(s1));
-        assertEquals(s1, record.getString(0));
-        assertEquals(1, record.countStrings());
-        assertEquals(2, record.getNumStrings());
-        assertEquals(1, record.getNumUniqueStrings());
-        assertEquals(1, record.addString(s2));
-        assertEquals(s2, record.getString(1));
-        assertEquals(2, record.countStrings());
-        assertEquals(3, record.getNumStrings());
-        assertEquals(2, record.getNumUniqueStrings());
+        assertEquals( 0, record.addString( s1 ) );
+        assertEquals( s1, record.getString( 0 ) );
+        assertEquals( 1, record.countStrings() );
+        assertEquals( 1, record.getNumStrings() );
+        assertEquals( 1, record.getNumUniqueStrings() );
+        assertEquals( 0, record.addString( s1 ) );
+        assertEquals( s1, record.getString( 0 ) );
+        assertEquals( 1, record.countStrings() );
+        assertEquals( 2, record.getNumStrings() );
+        assertEquals( 1, record.getNumUniqueStrings() );
+        assertEquals( 1, record.addString( s2 ) );
+        assertEquals( s2, record.getString( 1 ) );
+        assertEquals( 2, record.countStrings() );
+        assertEquals( 3, record.getNumStrings() );
+        assertEquals( 2, record.getNumUniqueStrings() );
         Iterator iter = record.getStrings();
 
-        while (iter.hasNext())
+        while ( iter.hasNext() )
         {
-            UnicodeString ucs = ( UnicodeString ) iter.next();
+            UnicodeString ucs = (UnicodeString) iter.next();
 
-            if (ucs.getString().equals(s1))
+            if ( ucs.getString().equals( s1 ) )
             {
-                assertEquals(( byte ) 0, ucs.getOptionFlags());
+                assertEquals( (byte) 0, ucs.getOptionFlags() );
             }
-            else if (ucs.getString().equals(s2))
+            else if ( ucs.getString().equals( s2 ) )
             {
-                assertEquals(( byte ) 1, ucs.getOptionFlags());
+                assertEquals( (byte) 1, ucs.getOptionFlags() );
             }
             else
             {
-                fail("cannot match string: " + ucs.getString());
+                fail( "cannot match string: " + ucs.getString() );
             }
         }
     }
@@ -415,25 +418,25 @@ public class TestSSTRecord
      */
 
     public void testReaderConstructor()
-        throws IOException
+            throws IOException
     {
-        byte[] testdata = readTestData("BigSSTRecord");
-        byte[] input    = new byte[ testdata.length - 4 ];
+        byte[] testdata = HexRead.readTestData( _test_file_path + File.separator + "BigSSTRecord" );
+        byte[] input = new byte[testdata.length - 4];
 
-        System.arraycopy(testdata, 4, input, 0, input.length);
-        SSTRecord record = new SSTRecord(LittleEndian.getShort(testdata, 0),
-                                         LittleEndian.getShort(testdata, 2),
-                                         input);
+        System.arraycopy( testdata, 4, input, 0, input.length );
+        SSTRecord record = new SSTRecord( LittleEndian.getShort( testdata, 0 ),
+                LittleEndian.getShort( testdata, 2 ),
+                input );
 
-        assertEquals(1464, record.getNumStrings());
-        assertEquals(688, record.getNumUniqueStrings());
-        assertEquals(492, record.countStrings());
-        assertEquals(1, record.getExpectedChars());
-        assertEquals("Consolidated B-24J Liberator The Dragon & His Tai",
-                     record.getUnfinishedString());
-        assertEquals(52, record.getTotalLength());
-        assertEquals(3, record.getStringDataOffset());
-        assertTrue(!record.isWideChar());
+        assertEquals( 1464, record.getNumStrings() );
+        assertEquals( 688, record.getNumUniqueStrings() );
+        assertEquals( 492, record.countStrings() );
+        assertEquals( 1, record.getDeserializer().getContinuationExpectedChars() );
+        assertEquals( "Consolidated B-24J Liberator The Dragon & His Tai",
+                record.getDeserializer().getUnfinishedString() );
+//        assertEquals( 52, record.getDeserializer().getTotalLength() );
+//        assertEquals( 3, record.getDeserializer().getStringDataOffset() );
+        assertTrue( !record.getDeserializer().isWideChar() );
     }
 
     /**
@@ -444,26 +447,26 @@ public class TestSSTRecord
     {
         SSTRecord record = new SSTRecord();
 
-        assertEquals(0, record.getNumStrings());
-        assertEquals(0, record.getNumUniqueStrings());
-        assertEquals(0, record.countStrings());
-        assertEquals(0, record.getExpectedChars());
-        assertEquals("", record.getUnfinishedString());
-        assertEquals(0, record.getTotalLength());
-        assertEquals(0, record.getStringDataOffset());
-        assertTrue(!record.isWideChar());
-        byte[] output   = record.serialize();
+        assertEquals( 0, record.getNumStrings() );
+        assertEquals( 0, record.getNumUniqueStrings() );
+        assertEquals( 0, record.countStrings() );
+        assertEquals( 0, record.getDeserializer().getContinuationExpectedChars() );
+        assertEquals( "", record.getDeserializer().getUnfinishedString() );
+//        assertEquals( 0, record.getDeserializer().getTotalLength() );
+//        assertEquals( 0, record.getDeserializer().getStringDataOffset() );
+        assertTrue( !record.getDeserializer().isWideChar() );
+        byte[] output = record.serialize();
         byte[] expected =
-        {
-            ( byte ) record.getSid(), ( byte ) (record.getSid() >> 8),
-            ( byte ) 8, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0
-        };
+                {
+                    (byte) record.getSid(), (byte) ( record.getSid() >> 8 ),
+                    (byte) 8, (byte) 0, (byte) 0, (byte) 0, (byte) 0,
+                    (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0
+                };
 
-        assertEquals(expected.length, output.length);
-        for (int k = 0; k < expected.length; k++)
+        assertEquals( expected.length, output.length );
+        for ( int k = 0; k < expected.length; k++ )
         {
-            assertEquals(String.valueOf(k), expected[ k ], output[ k ]);
+            assertEquals( String.valueOf( k ), expected[k], output[k] );
         }
     }
 
@@ -473,102 +476,99 @@ public class TestSSTRecord
      * @param ignored_args
      */
 
-    public static void main(String [] ignored_args)
+    public static void main( String[] ignored_args )
     {
-        System.out.println("Testing hssf.record.SSTRecord functionality");
-        junit.textui.TestRunner.run(TestSSTRecord.class);
+        System.out.println( "Testing hssf.record.SSTRecord functionality" );
+        junit.textui.TestRunner.run( TestSSTRecord.class );
     }
 
-    private byte [] readTestData(String filename)
-        throws IOException
+    /**
+     * Tests that workbooks with rich text that duplicates a non rich text cell can be read and written.
+     */
+    public void testReadWriteDuplicatedRichText1()
+            throws Exception
     {
-        File            file           = new File(_test_file_path
-                                                  + File.separator
-                                                  + filename);
-        FileInputStream stream         = new FileInputStream(file);
-        int             characterCount = 0;
-        byte            b              = ( byte ) 0;
-        List            bytes          = new ArrayList();
-        boolean         done           = false;
-
-        while (!done)
-        {
-            int count = stream.read();
-
-            switch (count)
-            {
-
-                case '0' :
-                case '1' :
-                case '2' :
-                case '3' :
-                case '4' :
-                case '5' :
-                case '6' :
-                case '7' :
-                case '8' :
-                case '9' :
-                    b <<= 4;
-                    b += ( byte ) (count - '0');
-                    characterCount++;
-                    if (characterCount == 2)
-                    {
-                        bytes.add(new Byte(b));
-                        characterCount = 0;
-                        b              = ( byte ) 0;
-                    }
-                    break;
-
-                case 'A' :
-                case 'B' :
-                case 'C' :
-                case 'D' :
-                case 'E' :
-                case 'F' :
-                    b <<= 4;
-                    b += ( byte ) (count + 10 - 'A');
-                    characterCount++;
-                    if (characterCount == 2)
-                    {
-                        bytes.add(new Byte(b));
-                        characterCount = 0;
-                        b              = ( byte ) 0;
-                    }
-                    break;
-
-                case 'a' :
-                case 'b' :
-                case 'c' :
-                case 'd' :
-                case 'e' :
-                case 'f' :
-                    b <<= 4;
-                    b += ( byte ) (count + 10 - 'a');
-                    characterCount++;
-                    if (characterCount == 2)
-                    {
-                        bytes.add(new Byte(b));
-                        characterCount = 0;
-                        b              = ( byte ) 0;
-                    }
-                    break;
-
-                case -1 :
-                    done = true;
-                    break;
-
-                default :
-                    break;
-            }
-        }
+        File file = new File( _test_file_path + File.separator + "duprich1.xls" );
+        InputStream stream = new FileInputStream( file );
+        HSSFWorkbook wb = new HSSFWorkbook( stream );
         stream.close();
-        Byte[] polished = ( Byte [] ) bytes.toArray(new Byte[ 0 ]);
-        byte[] rval     = new byte[ polished.length ];
+        HSSFSheet sheet = wb.getSheetAt( 1 );
+        assertEquals( "01/05 (Wed) ", sheet.getRow( 0 ).getCell( (short) 8 ).getStringCellValue() );
+        assertEquals( "01/05 (Wed)", sheet.getRow( 1 ).getCell( (short) 8 ).getStringCellValue() );
+
+        file = File.createTempFile( "testout", "xls" );
+        FileOutputStream outStream = new FileOutputStream( file );
+        wb.write( outStream );
+        outStream.close();
+        file.delete();
+
+        // test the second file.
+        file = new File( _test_file_path + File.separator + "duprich2.xls" );
+        stream = new FileInputStream( file );
+        wb = new HSSFWorkbook( stream );
+        stream.close();
+        sheet = wb.getSheetAt( 0 );
+        int row = 0;
+        assertEquals( "Testing ", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+        assertEquals( "rich", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+        assertEquals( "text", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+        assertEquals( "strings", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+        assertEquals( "Testing  ", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+        assertEquals( "Testing", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
+
+//        file = new File("/tryme.xls");
+        file = File.createTempFile( "testout", ".xls" );
+        outStream = new FileOutputStream( file );
+        wb.write( outStream );
+        outStream.close();
+        file.delete();
+    }
+
+    public void testSpanRichTextToPlainText()
+            throws Exception
+    {
+        byte[] bytes = HexRead.readTestData( _test_file_path + File.separator + "richtextdata.txt" );
+        BinaryTree strings = new BinaryTree();
+        SSTDeserializer deserializer = new SSTDeserializer( strings );
+        deserializer.manufactureStrings( bytes, 0, (short) 45 );
+        byte[] continueBytes = new byte[bytes.length - 45];
+        System.arraycopy( bytes, 45, continueBytes, 0, bytes.length - 45 );
+        deserializer.processContinueRecord( continueBytes );
+//        System.out.println( "strings.getKeyForValue(new Integer(0)) = " + strings.get( new Integer( 0 ) ) );
+
+        assertEquals( "At a dinner party orAt At At ", strings.get( new Integer( 0 ) ) + "" );
+    }
+
+    public void testContinuationWithNoOverlap()
+            throws Exception
+    {
+        byte[] bytes = HexRead.readTestData( _test_file_path + File.separator + "evencontinuation.txt" );
+        BinaryTree strings = new BinaryTree();
+        SSTDeserializer deserializer = new SSTDeserializer( strings );
+        deserializer.manufactureStrings( bytes, 0, (short) 43 );
+        byte[] continueBytes = new byte[bytes.length - 43];
+        System.arraycopy( bytes, 43, continueBytes, 0, bytes.length - 43 );
+        deserializer.processContinueRecord( continueBytes );
+
+        assertEquals( "At a dinner party or", strings.get( new Integer( 0 ) ) + "" );
+        assertEquals( "At a dinner party", strings.get( new Integer( 1 ) ) + "" );
+
+    }
+
+    public void testStringAcross2Continuations()
+            throws Exception
+    {
+        byte[] bytes = HexRead.readTestData( _test_file_path + File.separator + "stringacross2continuations.txt" );
+        BinaryTree strings = new BinaryTree();
+        SSTDeserializer deserializer = new SSTDeserializer( strings );
+        deserializer.manufactureStrings( bytes, 0, (short) 43 );
+        bytes = HexRead.readTestData( _test_file_path + File.separator + "stringacross2continuationsCR1.txt" );
+        deserializer.processContinueRecord( bytes );
+        bytes = HexRead.readTestData( _test_file_path + File.separator + "stringacross2continuationsCR2.txt" );
+        deserializer.processContinueRecord( bytes );
+
+        assertEquals( "At a dinner party or", strings.get( new Integer( 0 ) ) + "" );
+        assertEquals( "At a dinner partyAt a dinner party", strings.get( new Integer( 1 ) ) + "" );
 
-        for (int j = 0; j < polished.length; j++)
-        {
-            rval[ j ] = polished[ j ].byteValue();
-        }
-        return rval;
     }
 }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index f8c584839..3c7fb5163 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
@@ -55,7 +55,10 @@
 package org.apache.poi.hssf.usermodel;
 
 import junit.framework.TestCase;
-import org.apache.poi.hssf.record.RowRecord;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 
 /**
  * Test HSSFRow is okay.
@@ -87,33 +90,47 @@ public class TestHSSFRow
         assertEquals(1, row.getFirstCellNum());
         assertEquals(2, row.getLastCellNum());
 
-        RowRecord rowRecord = new RowRecord();
-        rowRecord.setFirstCol((short) 2);
-        rowRecord.setLastCol((short) 5);
-        row = new HSSFRow(workbook.getWorkbook(), sheet.getSheet(), rowRecord);
-        assertEquals(2, row.getFirstCellNum());
-        assertEquals(5, row.getLastCellNum());
     }
 
     public void testRemoveCell()
+            throws Exception
     {
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet();
         HSSFRow row = sheet.createRow((short) 0);
         assertEquals(-1, row.getLastCellNum());
         assertEquals(-1, row.getFirstCellNum());
-        row.createCell((short)1);
+        row.createCell((short) 1);
         assertEquals(1, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.createCell((short)3);
+        row.createCell((short) 3);
         assertEquals(3, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.removeCell(row.getCell((short)3));
+        row.removeCell(row.getCell((short) 3));
         assertEquals(1, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.removeCell(row.getCell((short)1));
+        row.removeCell(row.getCell((short) 1));
         assertEquals(-1, row.getLastCellNum());
         assertEquals(-1, row.getFirstCellNum());
 
+        // check the row record actually writes it out as 0's
+        byte[] data = new byte[100];
+        row.getRowRecord().serialize(0, data);
+        assertEquals(0, data[6]);
+        assertEquals(0, data[8]);
+
+        File file = File.createTempFile("XXX", "XLS");
+        FileOutputStream stream = new FileOutputStream(file);
+        workbook.write(stream);
+        stream.close();
+        FileInputStream inputStream = new FileInputStream(file);
+        workbook = new HSSFWorkbook(inputStream);
+        sheet = workbook.getSheetAt(0);
+        stream.close();
+        file.delete();
+        assertEquals(-1, sheet.getRow((short) 0).getLastCellNum());
+        assertEquals(-1, sheet.getRow((short) 0).getFirstCellNum());
+
+
     }
 }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 4868aee04..ddaedd922 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -58,7 +58,6 @@ import junit.framework.TestCase;
 import org.apache.poi.hssf.model.Sheet;
 import org.apache.poi.hssf.record.VCenterRecord;
 import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.dev.BiffViewer;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -190,7 +189,14 @@ public class TestHSSFSheet
         tempFile.delete();
         assertNotNull(row);
         assertEquals(2, row.getPhysicalNumberOfCells());
-
-
     }
+
+    public void testRemoveRow()
+    {
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        HSSFSheet sheet = workbook.createSheet("Test boolean");
+        HSSFRow row = sheet.createRow((short) 2);
+        sheet.removeRow(row);
+    }
+
 }
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/src/testcases/org/apache/poi/util/TestLittleEndian.java
index 1f2780d89..f9f2df238 100644
--- a/src/testcases/org/apache/poi/util/TestLittleEndian.java
+++ b/src/testcases/org/apache/poi/util/TestLittleEndian.java
@@ -437,6 +437,12 @@ public class TestLittleEndian
         return result;
     }
 
+    public void testUnsignedShort()
+            throws Exception
+    {
+        assertEquals(0xffff, LittleEndian.getUShort(new byte[] { (byte)0xff, (byte)0xff }, 0));
+    }
+
     /**
      * main method to run the unit tests
      *
diff --git a/src/testcases/org/apache/poi/util/TestPOILogFactory.java b/src/testcases/org/apache/poi/util/TestPOILogFactory.java
index 82aef5d5c..2e27e6a9b 100644
--- a/src/testcases/org/apache/poi/util/TestPOILogFactory.java
+++ b/src/testcases/org/apache/poi/util/TestPOILogFactory.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -55,11 +54,9 @@
 
 package org.apache.poi.util;
 
-import org.apache.log4j.Category;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-
-import java.io.*;
+import java.io.IOException;
 
 /**
  * @author Marc Johnson (mjohnson at apache dot org)
@@ -68,7 +65,7 @@ import java.io.*;
  */
 
 public class TestPOILogFactory
-    extends TestCase
+        extends TestCase
 {
     /**
      * Creates new TestPOILogFactory
@@ -76,9 +73,9 @@ public class TestPOILogFactory
      * @param name
      */
 
-    public TestPOILogFactory(String name)
+    public TestPOILogFactory( String name )
     {
-        super(name);
+        super( name );
     }
 
     /**
@@ -88,26 +85,26 @@ public class TestPOILogFactory
      */
 
     public void testLog()
-        throws IOException
+            throws IOException
     {
         //NKB Testing only that logging classes use gives no exception
         //    Since logging can be disabled, no checking of logging
         //    output is done.
-                 
-        POILogger     l1 = POILogFactory.getLogger("org.apache.poi.hssf.test");
-        POILogger     l2 = POILogFactory.getLogger("org.apache.poi.hdf.test");
 
-        l1.log(POILogger.FATAL, "testing cat org.apache.poi.hssf.*:FATAL");
-        l1.log(POILogger.ERROR, "testing cat org.apache.poi.hssf.*:ERROR");
-        l1.log(POILogger.WARN,  "testing cat org.apache.poi.hssf.*:WARN");
-        l1.log(POILogger.INFO,  "testing cat org.apache.poi.hssf.*:INFO");
-        l1.log(POILogger.DEBUG, "testing cat org.apache.poi.hssf.*:DEBUG");
+        POILogger l1 = POILogFactory.getLogger( "org.apache.poi.hssf.test" );
+        POILogger l2 = POILogFactory.getLogger( "org.apache.poi.hdf.test" );
 
-        l2.log(POILogger.FATAL, "testing cat org.apache.poi.hdf.*:FATAL");
-        l2.log(POILogger.ERROR, "testing cat org.apache.poi.hdf.*:ERROR");
-        l2.log(POILogger.WARN,  "testing cat org.apache.poi.hdf.*:WARN");
-        l2.log(POILogger.INFO,  "testing cat org.apache.poi.hdf.*:INFO");
-        l2.log(POILogger.DEBUG, "testing cat org.apache.poi.hdf.*:DEBUG");
+        l1.log( POILogger.FATAL, "testing cat org.apache.poi.hssf.*:FATAL" );
+        l1.log( POILogger.ERROR, "testing cat org.apache.poi.hssf.*:ERROR" );
+        l1.log( POILogger.WARN, "testing cat org.apache.poi.hssf.*:WARN" );
+        l1.log( POILogger.INFO, "testing cat org.apache.poi.hssf.*:INFO" );
+        l1.log( POILogger.DEBUG, "testing cat org.apache.poi.hssf.*:DEBUG" );
+
+        l2.log( POILogger.FATAL, "testing cat org.apache.poi.hdf.*:FATAL" );
+        l2.log( POILogger.ERROR, "testing cat org.apache.poi.hdf.*:ERROR" );
+        l2.log( POILogger.WARN, "testing cat org.apache.poi.hdf.*:WARN" );
+        l2.log( POILogger.INFO, "testing cat org.apache.poi.hdf.*:INFO" );
+        l2.log( POILogger.DEBUG, "testing cat org.apache.poi.hdf.*:DEBUG" );
 
     }
 
@@ -117,9 +114,9 @@ public class TestPOILogFactory
      * @param ignored_args
      */
 
-    public static void main(String [] ignored_args)
+    public static void main( String[] ignored_args )
     {
-        System.out.println("Testing basic util.POILogFactory functionality");
-        junit.textui.TestRunner.run(TestPOILogFactory.class);
+        System.out.println( "Testing basic util.POILogFactory functionality" );
+        junit.textui.TestRunner.run( TestPOILogFactory.class );
     }
 }
diff --git a/src/testcases/org/apache/poi/util/TestPOILogger.java b/src/testcases/org/apache/poi/util/TestPOILogger.java
index 62b47a24a..46248b5e2 100644
--- a/src/testcases/org/apache/poi/util/TestPOILogger.java
+++ b/src/testcases/org/apache/poi/util/TestPOILogger.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -57,19 +56,16 @@ package org.apache.poi.util;
 
 import junit.framework.TestCase;
 
-import java.io.File;
-import java.io.FileInputStream;
-
 /**
  * Tests the log class.
  *
  * @author Glen Stampoultzis (glens at apache.org)
  * @author Marc Johnson (mjohnson at apache dot org)
- * @author Nicola Ken Barozzi (nicolaken at apache.org) 
+ * @author Nicola Ken Barozzi (nicolaken at apache.org)
  */
 
 public class TestPOILogger
-    extends TestCase
+        extends TestCase
 {
     /**
      * Constructor TestPOILogger
@@ -79,23 +75,9 @@ public class TestPOILogger
      *
      */
 
-    public TestPOILogger(String s)
+    public TestPOILogger( String s )
     {
-        super(s);
-    }
-
-    /**
-     * Method setUp
-     *
-     *
-     * @exception Exception
-     *
-     */
-
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
+        super( s );
     }
 
     /**
@@ -103,29 +85,20 @@ public class TestPOILogger
      *
      * @exception Exception
      */
-
     public void testVariousLogTypes()
-        throws Exception
+            throws Exception
     {
         //NKB Testing only that logging classes use gives no exception
         //    Since logging can be disabled, no checking of logging
         //    output is done.
-        
-        POILogger     log = POILogFactory.getLogger("foo");
 
-        log.log(POILogger.WARN, "Test = ", new Integer(1));
-        log.logFormatted(POILogger.ERROR, "Test param 1 = %, param 2 = %",
-                         "2", new Integer(3));
-        log.logFormatted(POILogger.ERROR, "Test param 1 = %, param 2 = %",
-                         new int[]
-        {
-            4, 5
-        });
-        log.logFormatted(POILogger.ERROR,
-                         "Test param 1 = %1.1, param 2 = %0.1", new double[]
-        {
-            4, 5.23
-        });
+        POILogger log = POILogFactory.getLogger( "foo" );
+
+        log.log( POILogger.WARN, "Test = ", new Integer( 1 ) );
+        log.logFormatted( POILogger.ERROR, "Test param 1 = %, param 2 = %", "2", new Integer( 3 ) );
+        log.logFormatted( POILogger.ERROR, "Test param 1 = %, param 2 = %", new int[]{4, 5} );
+        log.logFormatted( POILogger.ERROR,
+                "Test param 1 = %1.1, param 2 = %0.1", new double[]{4, 5.23} );
 
     }
 }